Raphael 61c906a9d3 Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots ... Conflicts: app/models/user.rb app/views/groups/index.html.haml config/deploy_config.yml		2010-08-18 14:45:41 -07:00
..
backer.rb	look at the right yaml key	2010-08-13 12:47:19 -07:00
dev.rb	Copy tom seed to dev seed	2010-08-18 14:32:33 -07:00
tom.rb	changing settings and deploy scripts, validating email	2010-08-17 11:01:30 -07:00