Merge remote-tracking branch 'origin/release' into release-2016-06-28-conflict

2016-06-28 13:04:26 -04:00
parent aa078dfda2 17fb156baa
commit 225768ac2d
13 changed files with 280 additions and 112 deletions
--- a/scripts/safelint_thresholds.json
+++ b/scripts/safelint_thresholds.json
@@ -3,8 +3,8 @@
        "javascript-concat-html": 213,
        "javascript-escape": 7,
        "javascript-interpolate": 49,
-        "javascript-jquery-append": 111,
-        "javascript-jquery-html": 279,
+        "javascript-jquery-append": 104,
+        "javascript-jquery-html": 276,
        "javascript-jquery-insert-into-target": 27,
        "javascript-jquery-insertion": 29,
        "javascript-jquery-prepend": 13,
@@ -28,5 +28,5 @@
        "python-wrap-html": 264,
        "underscore-not-escaped": 658
    },
-    "total": 2245
+    "total": 2228
 }