Stefan Niedermann 9fe1b079ef 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		2021-06-28 10:06:50 +02:00
..
src	Merge branch 'master' into 916-settings	2021-06-28 10:06:50 +02:00
.gitignore	Added flavor builds to .gitignore	2020-03-27 10:20:05 +01:00
build.gradle	bump nextcloud-commons to 1.4.0	2021-06-24 19:53:31 +02:00
proguard-rules.pro	Initial commit	2015-10-01 17:54:20 +02:00