Christian Schabesberger c43ac7c869 fix conflict

2018-05-27 13:30:23 +02:00

..

src

fix conflict

2018-05-27 13:30:23 +02:00

.gitignore

New version number 0.6.0 and some fixes:

2015-11-10 20:51:39 +01:00

build.gradle

roll back to more stable version of newpipe extractor

2018-05-25 18:29:30 +02:00

proguard-rules.pro

Use OkHttp

2018-02-20 16:24:43 +01:00