y20k ff08eea0ba Merge remote-tracking branch 'origin/master' ... # Conflicts: # app/src/main/res/values-it/strings.xml # app/src/main/res/values-ja/strings.xml		2019-03-09 22:44:19 +01:00
..
src/main	Merge remote-tracking branch 'origin/master'	2019-03-09 22:44:19 +01:00
build.gradle	reformatted strings.xml files	2019-03-04 17:43:27 +01:00
proguard-rules.pro	rolling back the rollback (see last commit) - maybe found the culprit "-dontshrink" (see #44)	2018-11-04 10:13:19 +01:00