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
..
changelogs	Add changelog for v0.25.0 (992)	2023-01-22 08:56:29 +01:00
images	Add app icon to fastlane metadata	2022-01-19 12:03:46 +01:00
full_description.txt	adjust descriptions (en+de) to match the fork	2021-06-28 21:15:14 +02:00
short_description.txt	adjust descriptions (en+de) to match the fork	2021-06-28 21:15:14 +02:00