caneleex f5574d0445 Merge remote-tracking branch 'upstream/master' into feature/configurable-colors ... # Conflicts: # app/src/main/java/pl/jakubweg/SponsorBlockPreferenceFragment.java		2021-07-26 20:11:18 +02:00
..
src/main	Merge remote-tracking branch 'upstream/master' into feature/configurable-colors	2021-07-26 20:11:18 +02:00
.gitignore	Initial commit	2020-08-24 17:47:57 +02:00
build.gradle	Fixes (#34)	2021-06-08 17:25:01 +01:00
proguard-rules.pro	Initial commit	2020-08-24 17:47:57 +02:00