Raphael f66b5f4006 Merge branch 'master' of github.com:diaspora/diaspora into pivots ... Conflicts: app/controllers/users_controller.rb app/models/user.rb config/sprinkle/provision.rb		2010-08-19 16:09:08 -07:00
..
seeds	Merge branch 'master' of github.com:diaspora/diaspora into pivots	2010-08-19 16:09:08 -07:00
schema.rb	Activerecord this time\!	2010-06-11 10:40:49 -07:00
seeds.rb	IZ, RS; Moved every instance of hardcoded backer info out to yml file config/deploy_config.yml	2010-08-05 14:39:48 -07:00