80efd844ee
# Conflicts: # README.md # app/src/main/java/org/schabi/newpipe/player/Player.java # app/src/main/res/layout/player.xml # app/src/main/res/values-so/strings.xml # app/src/main/res/values/attrs.xml # app/src/main/res/values/strings.xml # app/src/main/res/values/styles.xml |
||
---|---|---|
.. | ||
images | ||
ISSUE_TEMPLATE | ||
workflows | ||
CONTRIBUTING.md | ||
FUNDING.yml | ||
PULL_REQUEST_TEMPLATE.md |