polymorphicshade 5ed80f425b SponsorBlock: Merge branch 'dev' into sponsorblock ... # Conflicts: # app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java # app/src/main/res/layout/player.xml # app/src/main/res/values/strings.xml		2020-09-27 11:46:35 -06:00
..
schemas/org.schabi.newpipe.database.AppDatabase	Implement feed groups manual sorting	2020-03-14 00:12:45 -03:00
src	SponsorBlock: Merge branch 'dev' into sponsorblock	2020-09-27 11:46:35 -06:00
.gitignore	Update app/.gitignore	2020-02-19 17:40:03 +01:00
build.gradle	Allow numbers and uppercase letters in app package id	2020-09-26 22:32:11 +02:00
proguard-rules.pro	Show parsed relative times instead of whatever the service gives us	2019-11-17 23:58:55 -03:00