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
..
drawable	add support for voting	2021-04-22 18:43:14 +02:00
drawable-xxxhdpi	Player overlay buttons redone	2020-10-15 18:53:00 +03:00
layout	Player overlay buttons redone	2020-10-15 18:53:00 +03:00
mipmap-hdpi	Initial commit	2020-08-24 17:47:57 +02:00
values	Merge branch 'master' into feature/show-stats	2021-07-23 23:43:59 +02:00