maxwell a742ef1253 Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: Gemfile		2010-07-16 21:33:57 -07:00
..
dashboards_controller_spec.rb	Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption	2010-07-15 13:06:46 -07:00
publics_controller_spec.rb	commit more often	2010-07-15 13:29:21 -07:00
request_controller_spec.rb	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-16 21:33:57 -07:00
requests_controller_spec.rb	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-16 21:33:57 -07:00
sockets_controller_spec.rb	DG MS; cleaned up views for person. Also, pluralized Dashboard and Socket	2010-07-08 14:14:03 -07:00