Raphael 12bd0f2301 Merge branch 'master' of http://github.com/uiri/diaspora

2010-09-27 14:48:11 -07:00

..

albums_controller.rb

Merge branch 'master' into HEAD

2010-09-22 21:32:03 -07:00

application_controller.rb

Remove consecutive empty lines

2010-09-25 12:06:39 -04:00

aspects_controller.rb

Label error notification as such.

2010-09-26 16:10:13 -04:00

comments_controller.rb

Remove consecutive empty lines

2010-09-25 12:06:39 -04:00

dev_utilities_controller.rb

Merging upstream changes

2010-09-25 15:57:59 -07:00

people_controller.rb

Remove consecutive empty lines

2010-09-25 12:06:39 -04:00

photos_controller.rb

Remove consecutive empty lines

2010-09-25 12:06:39 -04:00

publics_controller.rb

Remove consecutive empty lines

2010-09-25 12:06:39 -04:00

registrations_controller.rb

Merge branch 'master' into HEAD

2010-09-22 21:32:03 -07:00

requests_controller.rb

Remove consecutive empty lines

2010-09-25 12:06:39 -04:00

sockets_controller.rb

Remove consecutive empty lines

2010-09-25 12:06:39 -04:00

status_messages_controller.rb

Remove consecutive empty lines

2010-09-25 12:06:39 -04:00

users_controller.rb

Merge branch 'master' of http://github.com/uiri/diaspora

2010-09-27 14:48:11 -07:00