Merge remote-tracking branch 'origin/release' into merge-release-into-master

2016-06-29 19:51:14 -04:00
parent b3dc456133 c5392cb8fc
commit f4cf618154
3 changed files with 52 additions and 11 deletions
--- a/scripts/safelint_thresholds.json
+++ b/scripts/safelint_thresholds.json
@@ -4,8 +4,8 @@
        "javascript-escape": 7,
        "javascript-interpolate": 49,
        "javascript-jquery-append": 104,
-        "javascript-jquery-html": 276,
-        "javascript-jquery-insert-into-target": 27,
+        "javascript-jquery-html": 277,
+        "javascript-jquery-insert-into-target": 28,
        "javascript-jquery-insertion": 29,
        "javascript-jquery-prepend": 13,
        "mako-html-entities": 0,