Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 9fe1b079 authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

Merge branch 'master' into 916-settings 

# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
#	app/src/main/java/it/niedermann/owncloud/notes/shared/model/ApiVersion.java
#	app/src/main/res/values/strings.xml
parents 0d1136aa 7c5cb1b2
Expand all Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment