Merge branch 'master' into next

2014-08-05 21:46:39 -04:00 · 2014-08-05 21:46:39 -04:00 · 51ec8484a6
commit 51ec8484a6
parent 13967ad808 f85f55d3f0
1 changed files with 1 additions and 0 deletions
--- a/package.json
+++ b/package.json
@ -4,6 +4,7 @@
 	"scripts": {
 		"test": "grunt test"
 	},
+	"main": "mithril.js",
 	"devDependencies": {
 		"grunt-cli": "*",
 		"grunt-contrib-copy": "*",