polymorphicshade 5b3c971d67 Merge branch 'master' into sponsorblock ... # Conflicts: # .github/ISSUE_TEMPLATE/feature_request.yml # README.md # app/build.gradle # app/src/main/java/org/schabi/newpipe/DownloaderImpl.java # app/src/main/java/org/schabi/newpipe/error/ErrorActivity.java # app/src/main/java/org/schabi/newpipe/player/Player.java # app/src/main/res/values-es/strings.xml # app/src/main/res/values-so/strings.xml # app/src/main/res/values-zh-rTW/strings.xml # app/src/main/res/values/strings.xml		2022-09-25 15:36:33 -06:00
..
schemas/org.schabi.newpipe.database.AppDatabase	Migrate NotificationIcon to Picasso	2021-09-07 13:30:26 +03:00
src	Merge branch 'master' into sponsorblock	2022-09-25 15:36:33 -06:00
build.gradle	Merge branch 'master' into sponsorblock	2022-09-25 15:36:33 -06:00
proguard-rules.pro	Clean up proguard file	2022-06-09 11:34:57 -04:00