nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/controllers
History
Raphael 2489f8503f Merge branch 'master' into HEAD 
Conflicts:
	app/controllers/albums_controller.rb
	app/controllers/aspects_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/registrations_controller.rb
	app/controllers/requests_controller.rb
	app/helpers/dashboards_helper.rb
	app/views/albums/show.html.haml
	app/views/aspects/manage.html.haml
	app/views/shared/_aspect_nav.haml
	app/views/shared/_sub_header.haml
	app/views/status_messages/_status_message.html.haml
	app/views/status_messages/show.html.haml
	config/locales/de.yml
	config/locales/en.yml
	config/locales/es.yml
	config/locales/fr.yml
2010-09-22 21:32:03 -07:00
..
albums_controller.rb Merge branch 'master' into HEAD 2010-09-22 21:32:03 -07:00
application_controller.rb
aspects_controller.rb Merge branch 'master' into HEAD 2010-09-22 21:32:03 -07:00
comments_controller.rb
dev_utilities_controller.rb
people_controller.rb
photos_controller.rb Merge branch 'master' into HEAD 2010-09-22 21:32:03 -07:00
publics_controller.rb
registrations_controller.rb Merge branch 'master' into HEAD 2010-09-22 21:32:03 -07:00
requests_controller.rb Merge branch 'master' into HEAD 2010-09-22 21:32:03 -07:00
sockets_controller.rb Moved socket out to separate process. Multiple thins should now be possible 2010-09-16 21:34:15 -07:00
status_messages_controller.rb
users_controller.rb