danielvincent cbb692b6a3 Merge branch 'master' of github.com:diaspora/diaspora		2010-09-16 16:06:28 -07:00
..
albums_controller.rb	Merge branch 'master' of http://github.com/fbrubacher/diaspora	2010-09-16 12:14:11 -07:00
application_controller.rb
aspects_controller.rb	DG IZ; aspect deletion	2010-09-16 16:03:18 -07:00
comments_controller.rb
dev_utilities_controller.rb
people_controller.rb	MS added pagination to the search page	2010-09-16 11:47:34 -07:00
photos_controller.rb
publics_controller.rb
registrations_controller.rb
requests_controller.rb	Need more stack traces!	2010-09-15 23:22:02 -07:00
sockets_controller.rb
status_messages_controller.rb
users_controller.rb