Raphael 1e646fb0a9 Merge branch 'master' of github.com:diaspora/diaspora into production		2010-09-15 23:54:57 -07:00
..
controllers	Don't webfinger another server on receiving a webfinger request	2010-09-15 23:01:13 -07:00
fixtures	DG MS fixing webfinger, i hope to goodness	2010-09-15 13:28:06 -07:00
helpers	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
lib	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
models	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-15 22:37:05 -07:00
factories.rb	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-15 22:37:05 -07:00
misc_spec.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
spec_helper.rb	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-15 22:37:05 -07:00
user_encryption_spec.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00