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
..
schemas/org.schabi.newpipe.database.AppDatabase	Added "6.json"	2022-12-10 17:32:02 +01:00
src	Merge branch 'master' into sponsorblock	2023-02-11 16:21:57 -07:00
build.gradle	Merge branch 'master' into sponsorblock	2023-02-11 16:21:57 -07:00
proguard-rules.pro	Clean up proguard file	2022-06-09 11:34:57 -04:00