nextcloud-notes-android/app/src/main
Stefan Niedermann 474d9c3a8a 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
2020-06-08 22:01:56 +02:00
..
java/it/niedermann/owncloud/notes Merge branch 'master' into api-v1 2020-06-08 22:01:56 +02:00
res Merge branch 'master' into api-v1 2020-06-08 22:01:56 +02:00
AndroidManifest.xml #116 "Help: format" option in the menu 2020-06-07 19:11:33 +02:00
ic_launcher-web.png Update splashscreen and launcher icon 2020-05-25 20:48:43 +02:00