polymorphicshade b038ed6d1e SponsorBlock: Merge branch 'dev' into sponsorblock ... # Conflicts: # app/src/main/res/layout/player.xml		2020-10-02 16:28:47 -06:00
..
androidTest/java/org/schabi/newpipe	Fix some deprecations	2020-09-06 12:52:43 +02:00
debug	Fix empty stacktrace in bug report	2020-07-28 10:48:25 +02:00
main	SponsorBlock: Merge branch 'dev' into sponsorblock	2020-10-02 16:28:47 -06:00
test	Use final where possible	2020-08-16 10:25:09 +02:00