maxwell a742ef1253 Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: Gemfile		2010-07-16 21:33:57 -07:00
..
controllers	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-16 21:33:57 -07:00
fixtures	image uploading started	2010-07-16 12:31:24 -07:00
helpers	RS IZ; removed validations on marshaling and removed key deletion on person destroyw	2010-07-13 17:36:18 -07:00
lib	Merging in master	2010-07-14 12:16:24 -07:00
models	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-16 21:33:57 -07:00
factories.rb	RS, IZ; Profiles are now embedded	2010-07-14 11:22:44 -07:00
misc_spec.rb	Sorry rspec	2010-07-07 10:55:32 -07:00
spec_helper.rb	comment specs fixed, comments now signed by post poster	2010-07-15 14:41:39 -07:00
user_encryption_spec.rb	comment specs fixed, comments now signed by post poster	2010-07-15 14:41:39 -07:00