Dominik Stadler 0c50d1bbb7 Merge branch 'master' into remember_multiple_video_positions		2019-03-31 20:31:38 +02:00
..
src	Merge branch 'master' into remember_multiple_video_positions	2019-03-31 20:31:38 +02:00
.gitignore
build.gradle	adding a new string for some Pro migration clarification	2019-03-26 18:21:19 +01:00
proguard-rules.pro	adding a proguard rule about canvas	2018-09-05 22:13:18 +02:00