Merge remote-tracking branch 'origin/sync-worker' into sync-worker

Browse source

# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/fragment/PreferencesFragment.java
#	app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncWorker.java

...

This commit is contained in:

stefan-niedermann 2020-01-30 20:12:13 +01:00

parent 3b18b1b94f f9383c47db

commit e58e053097

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