Merge remote-tracking branch 'origin/master'

This commit is contained in:
Leo Horie 2014-06-03 22:47:13 -04:00
commit eb353aa808

View file

@ -24,10 +24,10 @@ dashboard.controller = function() {
dashboard.view = function(ctrl) {
return m("#example", [
m(".profile", [
new userProfile.view(ctrl.userProfile);
userProfile.view(ctrl.userProfile)
]),
m(".projects", [
new projectList.view(ctrl.projectList);
projectList.view(ctrl.projectList)
])
])
}