diff options
| author | Niedermann IT-Dienstleistungen <info@niedermann.it> | 2018-11-10 22:52:08 +0300 |
|---|---|---|
| committer | Niedermann IT-Dienstleistungen <info@niedermann.it> | 2018-11-10 22:52:08 +0300 |
| commit | 486cbf7d2c5e53781bca88c06875ac515bc3a9a2 (patch) | |
| tree | f98f18dbfbabd578afbfb764a0d8c5f15d448602 /app/src/main/res/xml | |
| parent | b350341ff50792f5d214daada9454306b73fc6f1 (diff) | |
| parent | 97e18d0356adc49b452b66f849416c9326501e0c (diff) | |
Merge branch 'master' of https://github.com/stefan-niedermann/nextcloud-deck
# Conflicts:
# app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
Diffstat (limited to 'app/src/main/res/xml')
0 files changed, 0 insertions, 0 deletions