Merge branch 'development'

Conflicts:
	package.json
This commit is contained in:
Sebastian McKenzie
2015-11-09 18:20:23 -08:00
31 changed files with 246 additions and 6784 deletions

View File

@@ -10,6 +10,7 @@
"bundle-collapser": "^1.2.1",
"chai": "^2.2.0",
"chalk": "1.1.1",
"codecov.io": "^0.1.6",
"derequire": "^2.0.2",
"es5-shim": "^4.1.7",
"eslint": "1.8.0",