6c9d23488b
Conflicts: app/src/main/res/values-pt/strings.xml |
||
---|---|---|
.. | ||
src | ||
.gitignore | ||
app.iml | ||
build.gradle | ||
proguard-project.txt |
6c9d23488b
Conflicts: app/src/main/res/values-pt/strings.xml |
||
---|---|---|
.. | ||
src | ||
.gitignore | ||
app.iml | ||
build.gradle | ||
proguard-project.txt |