ilya 02f37c6156 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: spec/controllers/aspects_controller_spec.rb		2010-10-20 13:21:16 -07:00
..
controllers	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-20 13:21:16 -07:00
fixtures	updated the hcard fixture, because the old one is not actually representive of what we are using	2010-10-16 11:16:33 -07:00
helpers	Some specs for the make_links function.	2010-10-17 22:25:56 +02:00
lib	Clean up specs a little, fix unfriending	2010-10-20 10:28:08 -07:00
models	MS IZ added test concerning people in multiple aspects	2010-10-20 13:19:32 -07:00
factories.rb	Error message for duplicate username; refactor User validation specs.	2010-10-16 22:36:26 -07:00
misc_spec.rb	Revert "Revert "Merge remote branch 'upstream/master'""	2010-10-20 09:51:55 -07:00
spec_helper.rb	Revert "Revert "Merge remote branch 'upstream/master'""	2010-10-20 09:51:55 -07:00
user_encryption_spec.rb	almost all green	2010-10-12 11:17:29 -07:00