Merge branch 'master' into tests

2016-11-09 14:44:43 +03:00
parent e64ae98378 2330a3ae08
commit 68e2f5c9ae
20 changed files with 437 additions and 78 deletions
--- a/package.json
+++ b/package.json
@@ -39,7 +39,10 @@
    "babel-plugin-transform-es2015-modules-systemjs": "^6.5.0",
    "babel-plugin-transform-es2015-for-of": "^6.6.0",
    "babel-preset-es2015": "^6.5.0",
-    "lodash": "^2.4.1",
+    "grunt-contrib-jshint": "^1.0.0",
+    "grunt-jscs": "^2.8.0",
+    "jshint-stylish": "^2.1.0",
+    "lodash": "~4.0.0",
    "mocha": "^2.4.5",
    "sinon": "~1.16.1"
  },