Merge remote-tracking branch 'origin/master'

This commit is contained in:
Leo Horie 2014-03-20 12:39:51 -04:00
commit e1faacb65e

View file

@ -27,7 +27,7 @@ var dashboardController = function() {
}; };
//view class //view class
var dashboardView = function() { var dashboardView = function(ctrl) {
return m("h1", ctrl.greeting); return m("h1", ctrl.greeting);
}; };
@ -47,7 +47,7 @@ dashboard.controller = function() {
}; };
//view class //view class
dashboard.view = function() { dashboard.view = function(ctrl) {
return m("h1", ctrl.greeting); return m("h1", ctrl.greeting);
}; };