5d222fce16
# Conflicts: # app/src/main/java/org/schabi/newpipe/NewVersionWorker.kt # app/src/main/java/org/schabi/newpipe/error/ErrorUtil.kt # app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java # app/src/main/java/org/schabi/newpipe/player/ui/VideoPlayerUi.java # app/src/main/java/us/shandian/giga/service/DownloadManagerService.java # app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java # app/src/main/res/values-es/strings.xml # app/src/main/res/values-it/strings.xml # app/src/main/res/values-zh-rTW/strings.xml |
||
---|---|---|
.. | ||
images | ||
ISSUE_TEMPLATE | ||
workflows | ||
CONTRIBUTING.md | ||
FUNDING.yml | ||
PULL_REQUEST_TEMPLATE.md |