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
..
changelogs	Update 34.txt	2019-04-10 14:00:14 +02:00
images	again logo: lower position of map on canvas	2019-04-10 13:47:46 +02:00
phoneScreenshots	added changelogs	2019-03-06 13:46:01 +01:00
full_description.txt	Merge remote-tracking branch 'origin/master'	2019-05-04 17:20:24 +02:00
short_description.txt	added changelogs	2019-03-06 13:46:01 +01:00
title.txt	added changelogs	2019-03-06 13:46:01 +01:00