diff options
| author | stefan-niedermann <info@niedermann.it> | 2019-12-13 22:45:18 +0300 |
|---|---|---|
| committer | stefan-niedermann <info@niedermann.it> | 2019-12-13 22:45:18 +0300 |
| commit | 4cad10ade67d6909ff0beb9ecdb6d05a8f56c05a (patch) | |
| tree | c87cfb9c0d0096324f5b68b07fd7f36d4153debe /app/src/main | |
| parent | ad65764004faa5f502f57a77dde7dfc923112239 (diff) | |
| parent | 81349047a8cd0eb54ff80cf976ddea574a13de16 (diff) | |
Merge remote-tracking branch 'origin/background-synchronization' into background-synchronization
# Conflicts:
# app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java
# app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncWorker.java
# app/src/main/java/it/niedermann/nextcloud/deck/ui/DrawerActivity.java
Diffstat (limited to 'app/src/main')
0 files changed, 0 insertions, 0 deletions