20be445e2b
# Conflicts: # app/src/main/res/values-nl/strings.xml |
||
---|---|---|
.. | ||
old/releases | ||
src | ||
.gitignore | ||
build.gradle | ||
proguard-rules.pro |
20be445e2b
# Conflicts: # app/src/main/res/values-nl/strings.xml |
||
---|---|---|
.. | ||
old/releases | ||
src | ||
.gitignore | ||
build.gradle | ||
proguard-rules.pro |