polymorphicshade 5b3c971d67 Merge branch 'master' into sponsorblock ... # Conflicts: # .github/ISSUE_TEMPLATE/feature_request.yml # README.md # app/build.gradle # app/src/main/java/org/schabi/newpipe/DownloaderImpl.java # app/src/main/java/org/schabi/newpipe/error/ErrorActivity.java # app/src/main/java/org/schabi/newpipe/player/Player.java # app/src/main/res/values-es/strings.xml # app/src/main/res/values-so/strings.xml # app/src/main/res/values-zh-rTW/strings.xml # app/src/main/res/values/strings.xml		2022-09-25 15:36:33 -06:00
..
android	Merge branch 'master' into sponsorblock	2022-09-25 15:36:33 -06:00