y20k d508908f99 Merge remote-tracking branch 'origin/master' ... # Conflicts: # app/src/main/ic_launcher-web.png # app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml # app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml # app/src/main/res/mipmap-hdpi/ic_launcher.png # app/src/main/res/mipmap-hdpi/ic_launcher_round.png # app/src/main/res/mipmap-mdpi/ic_launcher.png # app/src/main/res/mipmap-mdpi/ic_launcher_round.png # app/src/main/res/mipmap-xhdpi/ic_launcher.png # app/src/main/res/mipmap-xhdpi/ic_launcher_round.png # app/src/main/res/mipmap-xxhdpi/ic_launcher.png # app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png # app/src/main/res/mipmap-xxxhdpi/ic_launcher.png # app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png # assets/trackbook-app-icon-current.png # assets/trackbook-app-icon-current.svg # metadata/en-US/full_description.txt		2019-05-04 17:20:24 +02:00
..
src/main	Merge remote-tracking branch 'origin/master'	2019-05-04 17:20:24 +02:00
build.gradle	updated icon & added danish language (THX alexanderlhc)	2019-04-08 18:56:14 +02: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