Merge branch 'MDL-55167-master' of git://github.com/danpoltawski/moodle

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 0a576ef..e57da66 100644 (file)
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -2122,6 +2122,18 @@
         }
       }
     },
+    "stylelint-checkstyle-formatter": {
+      "version": "0.1.0",
+      "from": "stylelint-checkstyle-formatter@latest",
+      "resolved": "https://registry.npmjs.org/stylelint-checkstyle-formatter/-/stylelint-checkstyle-formatter-0.1.0.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "3.10.1",
+          "from": "lodash@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
+        }
+      }
+    },
     "sugarss": {
       "version": "0.1.5",
       "from": "sugarss@>=0.1.2 <0.2.0",

diff --git a/package.json b/package.json
index 41ef76e..7bcb65d 100644 (file)
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
     "grunt-eslint": "19.0.0",
     "grunt-stylelint": "0.6.0",
     "shifter": "0.5.0",
+    "stylelint-checkstyle-formatter": "0.1.0",
     "xmldom": "0.1.22",
     "xpath": "0.0.23"
   },