danielvincent cbb692b6a3 Merge branch 'master' of github.com:diaspora/diaspora		2010-09-16 16:06:28 -07:00
..
controllers	fixed small issue in albums#update anad added corressponding controller test	2010-09-16 12:21:08 -03: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	DG IZ; aspect deletion	2010-09-16 16:03:18 -07:00
factories.rb	fixed small issue in albums#update anad added corressponding controller test	2010-09-16 12:21:08 -03:00
misc_spec.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
spec_helper.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
user_encryption_spec.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00