Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into add-invidious

# Conflicts:
#	background.js
#	content.js
#	options/options.js
This commit is contained in:
Ajay Ramachandran
2020-01-09 14:28:06 -05:00
10 changed files with 519 additions and 523 deletions

View File

@@ -6,6 +6,7 @@
"description": "__MSG_Description__",
"content_scripts": [
{
"run_at": "document_start",
"matches": [
"https://*.youtube.com/*",
"https://www.youtube-nocookie.com/embed/*"
@@ -13,6 +14,7 @@
"all_frames": true,
"js": [
"config.js",
"SB.js",
"utils/previewBar.js",
"utils/skipNotice.js",
"utils.js",
@@ -56,6 +58,7 @@
},
"background": {
"scripts":[
"SB.js",
"utils.js",
"config.js",
"background.js"