diaspora

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

Files

Raphael 33048fe6db Merge branch 'master' of github.com:diaspora/diaspora into production

Conflicts:
	app/models/user.rb
	spec/models/aspect_spec.rb

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

albums_controller.rb

License notices replaced

2010-09-15 10:58:48 -07:00

application_controller.rb

License notices replaced

2010-09-15 10:58:48 -07:00

aspects_controller.rb

License notices replaced

2010-09-15 10:58:48 -07:00

comments_controller.rb

License notices replaced

2010-09-15 10:58:48 -07:00

dev_utilities_controller.rb

License notices replaced

2010-09-15 10:58:48 -07:00

people_controller.rb

License notices replaced

2010-09-15 10:58:48 -07:00

photos_controller.rb

License notices replaced

2010-09-15 10:58:48 -07:00

publics_controller.rb

License notices replaced

2010-09-15 10:58:48 -07:00

registrations_controller.rb

2010-09-15 17:13:17 -07:00

requests_controller.rb

License notices replaced

2010-09-15 10:58:48 -07:00

sockets_controller.rb

License notices replaced

2010-09-15 10:58:48 -07:00

status_messages_controller.rb

License notices replaced

2010-09-15 10:58:48 -07:00

users_controller.rb

2010-09-15 11:01:11 -07:00