diff options
author | stefan-niedermann <info@niedermann.it> | 2019-12-27 15:21:33 +0300 |
---|---|---|
committer | stefan-niedermann <info@niedermann.it> | 2019-12-27 15:21:33 +0300 |
commit | 3c645c6c415d03ee345ec4ac9bb473c06aafb01d (patch) | |
tree | 2ff5b9e8dd71d79f8394d023696931fe7483233a /app/src/main/res/values-ko | |
parent | fd61d81d1af2056b1bfc5d29df9225b11468eeca (diff) | |
parent | b47340db452a510b78520578369135ee4c1fa90d (diff) |
Merge remote-tracking branch 'origin/background-synchronization' into background-synchronization
# Conflicts:
# app/src/main/res/values/strings.xml
Diffstat (limited to 'app/src/main/res/values-ko')
0 files changed, 0 insertions, 0 deletions