diff options
| author | Stefan Niedermann <info@niedermann.it> | 2020-07-04 20:03:34 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2020-07-04 20:03:34 +0300 |
| commit | 4c7076ca1d5e16918d5074bfb0ce6619d592f3db (patch) | |
| tree | 51ba4c1522ddcd63513bcaec272ac3cc4ba3a347 /app/src/test/java/it/niedermann/nextcloud/deck | |
| parent | bb5dcb191e00d6bfcbe14c543feeed963e12ff25 (diff) | |
| parent | f302d4ac2de08138064bf1b8aa3863fd3b05a1d0 (diff) | |
Merge branch 'master' into 561_search_users
# Conflicts:
# app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java
Diffstat (limited to 'app/src/test/java/it/niedermann/nextcloud/deck')
0 files changed, 0 insertions, 0 deletions