polymorphicshade 063cfbc6b0 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-10-17 23:13:08 -06:00
..
android	Merge branch 'master' into sponsorblock	2021-10-17 23:13:08 -06:00