Raphael 61c906a9d3 Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots ... Conflicts: app/models/user.rb app/views/groups/index.html.haml config/deploy_config.yml		2010-08-18 14:45:41 -07:00
..
controllers	visible_person_by_id should check against self.person.id	2010-08-17 19:51:29 -07:00
fixtures	RS, IZ; extracted and murdered ostatus.	2010-08-04 16:00:01 -07:00
helpers	Made a few more tests pass	2010-08-16 16:22:46 -07:00
lib	refactored signature validation got specs passing	2010-08-17 23:21:00 -07:00
models	Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots	2010-08-18 14:45:41 -07:00
factories.rb	User email checking, routes working again	2010-08-17 13:02:42 -07:00
misc_spec.rb	User factory now works	2010-08-06 13:27:42 -07:00
spec_helper.rb	Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots	2010-08-17 23:25:33 -07:00
user_encryption_spec.rb	refactored signature validation got specs passing	2010-08-17 23:21:00 -07:00