diff options
| author | Stefan Niedermann <info@niedermann.it> | 2020-07-04 14:34:40 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2020-07-04 14:34:40 +0300 |
| commit | 0a4d8fc074b2fc06a48aab3242ec257014aa9b24 (patch) | |
| tree | 0371dff5f87c00e4731029b768c892e697bc5f9c /app/src/test/java/it/niedermann/nextcloud | |
| parent | dd5dff7fd1a518fda4fce182f52334ef90e4dc73 (diff) | |
| parent | f302d4ac2de08138064bf1b8aa3863fd3b05a1d0 (diff) | |
Merge branch 'master' into 455-clone-boards
# Conflicts:
# app/src/main/res/values/strings.xml
Diffstat (limited to 'app/src/test/java/it/niedermann/nextcloud')
0 files changed, 0 insertions, 0 deletions