Christian Schabesberger 067b15c300 Merge branch 'dev' of https://github.com/DafabHoid/NewPipe into test

2018-06-03 12:20:43 +02:00

..

androidTest/java/org/schabi/newpipe

Code improvements

2017-06-28 18:56:05 +02:00

debug

Merge branch 'player_fix' of https://github.com/karyogamy/NewPipe into dev

2018-02-21 23:20:08 +01:00

main

Merge branch 'dev' of https://github.com/DafabHoid/NewPipe into test

2018-06-03 12:20:43 +02:00

test

fix conflict

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