Raphael 33048fe6db Merge branch 'master' of github.com:diaspora/diaspora into production ... Conflicts: app/models/user.rb spec/models/aspect_spec.rb		2010-09-15 17:24:00 -07:00
..
backer.rb	take out index, change backer seed, no puts	2010-09-15 17:13:17 -07:00
dev.rb	First pass at having a custom registrationsController	2010-09-15 16:40:03 -07:00
tom.rb	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-15 17:24:00 -07:00