y20k c7e126d0e7 Merge remote-tracking branch 'origin/master' ... # Conflicts: # app/src/main/res/values-nl/strings.xml		2017-11-29 21:47:17 +01:00
..
src/main	Merge remote-tracking branch 'origin/master'	2017-11-29 21:47:17 +01:00
build.gradle	ui refresh - part 1	2017-11-28 22:02:45 +01:00
proguard-rules.pro	some clean-up 3	2017-08-21 13:52:00 +02:00