Mauricio Colli fc7c2c9f5a Merge remote-tracking branch 'weblate/master' into fix-strings ... # Conflicts: # app/src/main/res/values-b+ast/strings.xml # app/src/main/res/values-fr/strings.xml # app/src/main/res/values-pl/strings.xml # app/src/main/res/values-pt-rBR/strings.xml		2017-06-04 20:57:00 -03:00
..
src	Merge remote-tracking branch 'weblate/master' into fix-strings	2017-06-04 20:57:00 -03:00
.gitignore
build.gradle	moved on to version 0.9.7	2017-05-20 17:45:50 +02:00
proguard-rules.pro