Merge remote-tracking branch 'origin/master' into next

This commit is contained in:
Leo Horie 2014-06-14 00:10:16 -04:00
commit bcaff74c03

View file

@ -69,7 +69,7 @@ var dashboard = {
return [ return [
m("h1", controller.greeting), m("h1", controller.greeting),
new user.view(controller.user) user.view(controller.user)
]; ];
} }
}; };