Daniel Vincent Grippi e94b48e19a Merge branch 'master' of github.com:diaspora/diaspora into production ... Conflicts: app/models/user.rb		2010-09-15 15:55:18 -07:00
..
seeds	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-15 15:55:18 -07:00
schema.rb	License notices replaced	2010-09-15 10:58:48 -07:00
seeds.rb	License notices replaced	2010-09-15 10:58:48 -07:00