stefan-niedermann ff8a67f611 Merge branch 'master' into 354-password-protection ... # Conflicts: # app/src/main/res/values/strings.xml		2020-01-25 15:35:47 +01:00
..
androidTest/java/it/niedermann/owncloud/notes	Merge branch '623-note-links' of https://github.com/lenzls/nextcloud-notes	2020-01-18 09:01:06 +01:00
main	Merge branch 'master' into 354-password-protection	2020-01-25 15:35:47 +01:00