Merge branch 'master' into development

This commit is contained in:
Sebastian McKenzie 2015-07-29 03:22:05 +01:00
commit 484eb4dee8

View File

@ -3,7 +3,7 @@
"devDependencies": {
"babel": "5.6.10",
"babel-eslint": "^3.1.19",
"browserify": "^9.0.8",
"browserify": "^11.0.0",
"chai": "^2.2.0",
"es5-shim": "^4.1.7",
"eslint": "^0.21.2",