polymorphicshade 0da8d00ddd Merge branch 'master' into sponsorblock ... # Conflicts: # 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 # app/src/main/res/values/strings.xml		2022-11-06 10:17:23 -07:00
..
schemas/org.schabi.newpipe.database.AppDatabase	Revert changes	2022-10-27 12:15:36 +11:00
src	Merge branch 'master' into sponsorblock	2022-11-06 10:17:23 -07:00
build.gradle	Merge branch 'master' into sponsorblock	2022-11-06 10:17:23 -07:00
proguard-rules.pro	Clean up proguard file	2022-06-09 11:34:57 -04:00