caneleex 744135d7cb 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

..

objects

initial cleanup

2021-07-19 16:19:47 +02:00

requests

moved appending the settings

2021-07-23 14:56:54 +02:00

InjectedPlugin.java

Fixes (#34)

2021-06-08 17:25:01 +01:00

NewSegmentHelperLayout.java

Player overlay buttons redone

2020-10-15 18:53:00 +03:00

PlayerController.java

Merge branch 'master' into feature/show-stats

2021-07-23 23:43:59 +02:00

ShieldButton.java

cleanup imports

2021-07-19 16:44:33 +02:00

SkipSegmentView.java

initial cleanup

2021-07-19 16:19:47 +02:00

SponsorBlockPreferenceFragment.java

Merge branch 'master' into feature/show-stats

2021-07-23 23:43:59 +02:00

SponsorBlockSettings.java

Merge branch 'master' into feature/show-stats

2021-07-23 23:43:59 +02:00

SponsorBlockUtils.java

Merge branch 'master' into feature/show-stats

2021-07-23 23:43:59 +02:00

StringRef.java

add local skips tracking

2021-07-19 21:51:26 +02:00

VotingButton.java

cleanup imports

2021-07-19 16:44:33 +02:00