mirror of
https://github.com/nextcloud/notes-android.git
synced 2024-10-25 22:26:00 +03:00
Merge remote-tracking branch 'origin/sync-worker' into sync-worker
# 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:
commit
e58e053097