polymorphicshade 877503c4be Merge branch 'master' into sponsorblock ... # Conflicts: # README.es.md # README.ko.md # README.md # README.pt_BR.md # README.ro.md # README.so.md # README.tr.md # app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java # app/src/main/java/org/schabi/newpipe/player/Player.java # app/src/main/res/layout-large-land/player.xml # app/src/main/res/layout/player.xml # app/src/main/res/values/strings.xml		2021-12-11 22:45:34 -07:00
..
schemas/org.schabi.newpipe.database.AppDatabase	Make uploader_url column nullable	2021-08-14 17:48:35 +08:00
src	Merge branch 'master' into sponsorblock	2021-12-11 22:45:34 -07:00
build.gradle	Merge branch 'master' into sponsorblock	2021-12-11 22:45:34 -07:00
proguard-rules.pro	Show parsed relative times instead of whatever the service gives us	2019-11-17 23:58:55 -03:00