polymorphicshade 991c12c539 SponsorBlock: Merge branch 'dev' into sponsorblock ... # Conflicts: # README.md # app/build.gradle # app/src/main/res/values/attrs.xml # app/src/main/res/values/strings.xml		2020-12-28 13:43:26 -07: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-12-28 13:43:26 -07:00
.gitignore	Update app/.gitignore	2020-02-19 17:40:03 +01:00
build.gradle	SponsorBlock: Merge branch 'dev' into sponsorblock	2020-12-28 13:43:26 -07:00
proguard-rules.pro	Show parsed relative times instead of whatever the service gives us	2019-11-17 23:58:55 -03:00