Weblate d36c371c1d Merge remote-tracking branch 'origin/dev' into dev		2018-02-20 14:36:49 +01:00
..
assets	add themes to license dialog	2017-09-22 11:07:17 +02:00
java	Merge pull request #1109 from TobiGr/soundcloud-kiosk	2018-02-20 13:38:20 +01:00
res	Merge remote-tracking branch 'origin/dev' into dev	2018-02-20 14:36:49 +01:00
AndroidManifest.xml	merge RouterActivity and RouterVideoActivity	2018-02-12 23:07:17 +01:00