341b62fa57
# Conflicts: # app/src/main/res/values/strings.xml # app/src/main/res/xml/pref_general.xml |
||
---|---|---|
.. | ||
src | ||
build.gradle | ||
proguard-rules.pro |
341b62fa57
# Conflicts: # app/src/main/res/values/strings.xml # app/src/main/res/xml/pref_general.xml |
||
---|---|---|
.. | ||
src | ||
build.gradle | ||
proguard-rules.pro |