Merge branch 'master' into proxy-support

2020-11-11 17:14:07 -06:00
parent 1a825ac507 f0afc0da36
commit 63996ce416
72 changed files with 4236 additions and 1819 deletions
@@ -47,7 +47,7 @@ module.exports = {
      "error",
      {
        "escape": {
-          "taggedTemplates": ["escaped"]
+          "taggedTemplates": ["Utils.escaped"]
        }
      }
    ],