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
..
development.rb	Actionmailer actually working	2010-08-17 15:47:41 -07:00
production.rb	Actionmailer actually working	2010-08-17 15:47:41 -07:00
test.rb	MS app now works with rc1	2010-08-18 17:42:04 -07:00