Merge tag '1.10.0'

nicole-ashley · Nov 29, 2016 · 326cf56 · 326cf56
2 parents 1b16563 + 8b73ac1
commit 326cf56
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 61 deletions.
diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
 
     "name": "uBlock Origin",
-    "version": "1.9.17.100",
+    "version": "1.10.0",
 
     "default_locale": "en",
     "description": "__MSG_extShortDesc__",

diff --git a/platform/edge/manifest.json b/platform/edge/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
 
     "name": "uBlock Origin",
-    "version": "1.9.17.100",
+    "version": "1.10.0",
 
     "default_locale": "en",
     "description": "__MSG_extShortDesc__",

diff --git a/src/_locales/da/messages.json b/src/_locales/da/messages.json
@@ -420,7 +420,7 @@
     "description":"English: List of your dynamic filtering rules."
   },
   "rulesFormatHint":{
-    "message":"Regelsyntaks: <code>kilde destination type handling<\/code> (<a href<a href='https:\/\/github.com\/gorhill\/uBlock\/wiki\/Dynamic-filtering:-rule-syntax'>Fuld dokumentation<\/a>).",
+    "message":"Regelsyntaks: <code>kilde destination type handling<\/code> (<a href='https:\/\/github.com\/gorhill\/uBlock\/wiki\/Dynamic-filtering:-rule-syntax'>Fuld dokumentation<\/a>).",
     "description":"English: dynamic rule syntax and full documentation."
   },
   "whitelistPrompt":{

diff --git a/src/document-suspended.html b/src/document-suspended.html
diff --git a/src/js/document-suspended.js b/src/js/document-suspended.js