Daniel Vincent Grippi 40ecf176e8 Merge branch 'master' of github.com:diaspora/diaspora		2010-09-13 14:26:15 -07:00
..
aspects_controller_spec.rb
people_controller_spec.rb
publics_controller_spec.rb
requests_controller_spec.rb	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-13 14:26:15 -07:00
sockets_controller_spec.rb	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-13 14:26:15 -07:00