polymorphicshade 80efd844ee Merge branch 'master' into sponsorblock ... # Conflicts: # README.md # app/src/main/java/org/schabi/newpipe/player/Player.java # app/src/main/res/layout/player.xml # app/src/main/res/values-so/strings.xml # app/src/main/res/values/attrs.xml # app/src/main/res/values/strings.xml # app/src/main/res/values/styles.xml		2021-04-27 00:23:27 -06:00
..
schemas/org.schabi.newpipe.database.AppDatabase	Implement feed groups manual sorting	2020-03-14 00:12:45 -03:00
src	Merge branch 'master' into sponsorblock	2021-04-27 00:23:27 -06:00
.gitignore	Update app/.gitignore	2020-02-19 17:40:03 +01:00
build.gradle	Merge branch 'master' into sponsorblock	2021-04-27 00:23:27 -06:00
proguard-rules.pro	Show parsed relative times instead of whatever the service gives us	2019-11-17 23:58:55 -03:00