Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into min-duration

Browse Source

# Conflicts:
#	SB.js
#	src/options.ts

...

This commit is contained in:

Ajay Ramachandran

2020-02-08 19:09:17 -05:00

parent b5996a9783 feda7fd1a0

commit 885fae175d

62 changed files with 6723 additions and 982 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1143

src/content.ts Normal file

File diff suppressed because it is too large Load Diff