diff options
| author | Stefan Niedermann <info@niedermann.it> | 2021-05-03 18:36:24 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2021-05-03 19:22:38 +0300 |
| commit | bbf569b0e9a1a93e4fff8074cc180274fc1f2d24 (patch) | |
| tree | e43c3237b7a36d8d3f4881129cd977e93690f9db /app/src/main/res/values-w600dp | |
| parent | e3c4c1cb40ba229f50dd534c9edef42cb807ed18 (diff) | |
| parent | 1cc44ede8e6c605345d794452c099a07a49d2f49 (diff) | |
Merge branch 'master' into 916-settings
# Conflicts:
# app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountAdapter.java
# app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java
# app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesClient.java
# app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesClientV1.java
# app/src/main/java/it/niedermann/owncloud/notes/shared/model/ApiVersion.java
# app/src/main/res/values/strings.xml
Diffstat (limited to 'app/src/main/res/values-w600dp')
0 files changed, 0 insertions, 0 deletions