Raphael d7828a8bf3 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor ... Conflicts: spec/controllers/publics_controller_spec.rb		2010-08-11 13:59:21 -07:00
..
groups_controller_spec.rb	Renamed dashboards spec to groups	2010-08-10 12:28:36 -07:00
publics_controller_spec.rb	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-11 13:59:21 -07:00
sockets_controller_spec.rb	IZ MS; Socket test now passes	2010-08-10 17:50:17 -07:00