caneleex b630bf8e84 Merge branch 'master' into feature/show-stats ... # Conflicts: # app/src/main/java/pl/jakubweg/SponsorBlockSettings.java # app/src/main/java/pl/jakubweg/SponsorBlockUtils.java		2021-07-23 23:43:59 +02:00
..
src/main	Merge branch 'master' into feature/show-stats	2021-07-23 23:43:59 +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