polymorphicshade ed6a94b3fb Merge branch 'master' into sponsorblock ... # Conflicts: # README.md # app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java # app/src/main/java/org/schabi/newpipe/player/Player.java # app/src/main/java/org/schabi/newpipe/settings/SettingsResourceRegistry.java # app/src/main/java/us/shandian/giga/service/DownloadManagerService.java # app/src/main/res/values-es/strings.xml # app/src/main/res/values-it/strings.xml # app/src/main/res/values-zh-rTW/strings.xml # app/src/main/res/values/strings.xml # doc/README.es.md # doc/README.ja.md # doc/README.ko.md # doc/README.pt_BR.md # doc/README.ro.md # doc/README.so.md # doc/README.tr.md		2023-08-03 17:59:38 -06:00
..
android	Merge branch 'master' into sponsorblock	2023-08-03 17:59:38 -06:00