Weblate 0f7397e3b8 Merge remote-tracking branch 'origin/master'

2017-01-26 15:46:09 +01:00

..

androidTest/java/org/schabi/newpipe

fixed Downloader.getInstance() in unit tests

2016-12-24 17:11:29 +01:00

main

Merge remote-tracking branch 'origin/master'

2017-01-26 15:46:09 +01:00

test/java

resolve conflict

2017-01-22 14:26:01 +01:00