Merge branch 'master' into next

This commit is contained in:
Leo Horie 2014-08-05 21:46:39 -04:00
commit 51ec8484a6

View file

@ -4,6 +4,7 @@
"scripts": { "scripts": {
"test": "grunt test" "test": "grunt test"
}, },
"main": "mithril.js",
"devDependencies": { "devDependencies": {
"grunt-cli": "*", "grunt-cli": "*",
"grunt-contrib-copy": "*", "grunt-contrib-copy": "*",