Raphael 701bec670f Merge branch 'master' of github.com:diaspora/diaspora into pivots ... Conflicts: app/views/groups/index.html.haml config/deploy_config.yml		2010-08-18 20:50:28 -07:00
..
controllers	going back to showing the first group on the index page	2010-08-18 16:35:11 -07:00
helpers	the album create doesn't crash the app	2010-08-18 20:14:31 -07:00
models	Merge branch 'master' of github.com:diaspora/diaspora into pivots	2010-08-18 20:50:28 -07:00
uploaders	Moving to file store	2010-08-18 16:37:05 -07:00
views	Merge branch 'master' of github.com:diaspora/diaspora into pivots	2010-08-18 20:50:28 -07:00