polymorphicshade 9a5aab7e2d Merge branch 'master' into sponsorblock ... # Conflicts: # app/build.gradle # app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java # app/src/main/java/org/schabi/newpipe/DownloaderImpl.java # app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java # app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java # app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java # app/src/main/res/values-so/strings.xml # app/src/main/res/values/strings.xml # fastlane/metadata/android/de/full_description.txt		2021-09-26 11:24:42 -06:00
..
android	Merge branch 'master' into sponsorblock	2021-09-26 11:24:42 -06:00