Weblate 77b488568b Merge branch 'origin/dev' into Weblate		2018-06-17 15:56:31 +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 'origin/dev' into Weblate	2018-06-17 15:56:31 +02:00
test	fix conflict	2018-05-27 13:30:23 +02:00