Weblate 0798745c16 Merge remote-tracking branch 'origin/dev' into dev		2018-02-16 18:39:33 +01:00
..
assets	add themes to license dialog	2017-09-22 11:07:17 +02:00
java	solve merge conflict	2018-02-14 21:06:20 +01:00
res	Merge remote-tracking branch 'origin/dev' into dev	2018-02-16 18:39:33 +01:00
AndroidManifest.xml	merge RouterActivity and RouterVideoActivity	2018-02-12 23:07:17 +01:00