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
..
java	Remove unused strings	2017-05-23 11:53:50 -03:00
res	Merge remote-tracking branch 'weblate/master' into fix-strings	2017-06-04 20:57:00 -03:00
AndroidManifest.xml	Remove unused strings	2017-05-23 11:53:50 -03:00