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
..
controllers	DG MS fixing webfinger, i hope to goodness	2010-09-15 13:28:06 -07:00
fixtures	DG MS fixing webfinger, i hope to goodness	2010-09-15 13:28:06 -07:00
helpers	License notices replaced	2010-09-15 10:58:48 -07:00
lib	fixing merge	2010-09-15 13:29:39 -07:00
models	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-15 15:55:18 -07:00
factories.rb	Merge branch 'production' of github.com:diaspora/diaspora into production	2010-09-15 14:11:24 -07:00
misc_spec.rb	License notices replaced	2010-09-15 10:58:48 -07:00
spec_helper.rb	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-15 11:01:11 -07:00
user_encryption_spec.rb	DG MS fixing webfinger, i hope to goodness	2010-09-15 13:28:06 -07:00