Christian Schabesberger 665b9087b1 fix conflict		2018-04-08 18:49:27 +02:00
..
src	fix conflict	2018-04-08 18:49:27 +02:00
.gitignore	New version number 0.6.0 and some fixes:	2015-11-10 20:51:39 +01:00
build.gradle	Fix Info's start time when using VideoDetailFragment	2018-04-06 04:35:44 -03:00
proguard-rules.pro	Use OkHttp	2018-02-20 16:24:43 +01:00