diaspora

mirror of https://github.com/diaspora/diaspora.git synced 2026-04-29 03:01:03 -04:00

Files

Raphael 950c6a7cab Merge branch '1.9.2' into HEAD

Conflicts:
	app/models/photo.rb

2010-09-24 14:36:00 -07:00

albums_controller.rb

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

application_controller.rb

DG IZ; cleanup

2010-09-22 15:48:50 -07:00

aspects_controller.rb

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

comments_controller.rb

2010-09-23 10:17:13 -07:00

dev_utilities_controller.rb

2010-09-20 11:30:27 -07:00

people_controller.rb

2010-09-20 13:18:11 -07:00

photos_controller.rb

2010-09-24 14:36:00 -07:00

publics_controller.rb

2010-09-24 09:15:10 -07:00

registrations_controller.rb

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

requests_controller.rb

2010-09-23 10:39:04 -07:00

sockets_controller.rb

2010-09-16 21:34:15 -07:00

status_messages_controller.rb

2010-09-20 13:18:11 -07:00

users_controller.rb

2010-09-20 11:30:27 -07:00