Merge remote-tracking branch 'origin/enhance-category-handling' into enhance-category-handling

Browse source

# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/fragment/CategoryDialogFragment.java
#	app/src/main/java/it/niedermann/owncloud/notes/model/NavigationAdapter.java
#	app/src/main/res/layout/dialog_change_category.xml

...

This commit is contained in:

stefan-niedermann 2020-01-19 19:10:15 +01:00

parent 1a17e82eb6 4fc08ada66

commit 7207df6c53

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available