Merge branch 'private_projects'
authorTero Hanninen <tero.j.hanninen@jyu.fi>
Fri, 23 Apr 2010 13:02:51 +0000 (16:02 +0300)
committerTero Hanninen <tero.j.hanninen@jyu.fi>
Fri, 23 Apr 2010 13:02:51 +0000 (16:02 +0300)
commit08eeee9ed6810d5f9d0e4d065ca3215125ec2ab5
treedb029fe927e698b4447b6f68ed5b18387df39c6c
parent0ab61dc38ba9619164ce7f51a329e8b97d655a00
parent791fe26cab3ebf16c7c1e08d0fd47f6ce8c82e85
Merge branch 'private_projects'
app/controllers/users_controller.rb
app/views/site/dashboard.html.erb