polymorphicshade 8e7238cd54 SponsorBlock: Merge branch 'dev' into sponsorblock ... # Conflicts: # app/src/main/res/values/strings.xml		2020-12-10 11:33:27 -07:00
..
androidTest/java/org/schabi/newpipe	Update most dependencies	2020-11-22 14:03:10 +01:00
debug	Update most dependencies	2020-11-22 14:03:10 +01:00
main	SponsorBlock: Merge branch 'dev' into sponsorblock	2020-12-10 11:33:27 -07:00
release/res/xml	Format all XML resources	2020-10-14 11:04:48 +02:00
test	Add a workaround for a possible null offset ID.	2020-12-10 15:23:30 +05:30