polymorphicshade 50460f8ea6 SponsorBlock: Merge branch 'master' into sponsorblock (pending re-implementing SponsorBlock) ... # Conflicts: # README.md # app/src/main/AndroidManifest.xml # app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java # app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java # app/src/main/java/org/schabi/newpipe/player/BasePlayer.java # app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java # app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java # app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java # app/src/main/res/layout/player.xml # app/src/main/res/values-so/strings.xml # app/src/main/res/values/strings.xml		2021-02-14 15:37:20 -07:00
..
images	README updates	2020-11-28 16:35:51 -07:00
ISSUE_TEMPLATE	Checklist is compulsory: feature request template	2021-01-01 18:42:07 +00:00
workflows	Checkout branch in CI process for pull requests	2021-01-14 19:39:40 +01:00
CONTRIBUTING.md	Contributing guidelines reworked (#4318)	2020-11-28 12:00:00 +01:00
FUNDING.yml	Create FUNDING.yml	2019-08-13 22:10:04 -04:00
PULL_REQUEST_TEMPLATE.md	Re-add APK testing section to PR template (#5465)	2021-01-30 10:18:58 +00:00