Christoph Loy f1ce566511 Merge branch 'master' into 354-password-protection ... # Conflicts: # app/src/main/java/it/niedermann/owncloud/notes/android/activity/AboutActivity.java # app/src/main/java/it/niedermann/owncloud/notes/android/activity/EditNoteActivity.java # app/src/main/java/it/niedermann/owncloud/notes/android/activity/ExceptionActivity.java # app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java # app/src/main/java/it/niedermann/owncloud/notes/android/activity/PreferencesActivity.java # app/src/main/java/it/niedermann/owncloud/notes/android/activity/SelectSingleNoteActivity.java # app/src/main/java/it/niedermann/owncloud/notes/android/fragment/PreferencesFragment.java # app/src/main/java/it/niedermann/owncloud/notes/util/Notes.java		2020-03-02 16:28:51 +01:00
..
create_note_widget_provider.xml	Fix some linter issues	2020-02-24 19:54:58 +01:00
network_security_config.xml	Accept user-installed certificates with Nougat	2017-03-20 16:46:35 +01:00
note_list_widget_provider_info.xml	#365 Password protection	2020-01-25 13:58:57 +01:00
preferences.xml	Merge branch 'master' into 354-password-protection	2020-03-02 16:28:51 +01:00
searchable.xml	Chores	2019-10-12 16:50:31 +02:00
shortcuts.xml	version bump to 2.7.1	2020-01-23 23:27:51 +01:00
single_note_widget_provider_info.xml	#355 Adaptive Icon	2018-04-10 15:11:36 +02:00