Stefan Niedermann 83f1e06c0f Merge branch 'master' into api-v1 ... # Conflicts: # app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java # app/src/main/res/values/strings.xml		2020-06-07 10:55:29 +02:00
..
context_based_formatting.xml	Implement menu for context based formatting without selected range	2020-02-22 11:48:55 +01:00
context_based_range_formatting.xml	Implement menu for context based formatting without selected range	2020-02-22 11:48:55 +01:00
menu_list_context_multiple.xml	Merge branch 'master' into branding	2020-06-02 17:10:40 +02:00
menu_note_activity.xml	Make toolbars the same background color as the main content	2020-06-01 17:57:32 +02:00
menu_note_fragment.xml	Merge branch 'master' into api-v1	2020-06-07 10:55:29 +02:00