This repository has been archived by the owner on Dec 30, 2023. It is now read-only.
Tags: gilbsgilbs/NewPipeSponsorBlock
Tags
Merge branch 'sponsorblock' of https://github.com/polymorphicshade/Ne… …wPipe into sponsorblock
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
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
PreviousNext