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

Skip to content
Commit 474d9c3a authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

Merge branch 'master' into api-v1 

# Conflicts:
#	app/src/androidTest/java/it/niedermann/owncloud/notes/persistence/NotesDatabaseTest.java
#	app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java
#	app/src/main/java/it/niedermann/owncloud/notes/persistence/AbstractNotesDatabase.java
#	app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
#	app/src/main/java/it/niedermann/owncloud/notes/util/NoteUtil.java
parents aeda3b84 2e2bbb9b
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment