NewPipe/.github
polymorphicshade 5d222fce16 Merge branch 'master' into sponsorblock
# 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
2023-02-11 16:21:57 -07:00
..
images README updates 2020-11-28 16:35:51 -07:00
ISSUE_TEMPLATE Merge branch 'master' into sponsorblock 2022-11-06 10:17:23 -07:00
workflows Update Sonarqube to 3.5 2022-11-29 11:20:31 -05:00
CONTRIBUTING.md Add info on date + time localization to contribution guidelines (#9229) 2022-10-28 17:35:56 +02:00
FUNDING.yml Update FUNDING.yml (#7682) 2022-02-04 10:36:00 +00:00
PULL_REQUEST_TEMPLATE.md Remove extra whitespace from issue and PR templates 2022-08-11 19:34:23 +03:00