nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/controllers
History
ilya 08b9aa864a Merge branch 'master' of github.com:diaspora/diaspora into fb 
Conflicts:
	app/views/layouts/application.html.haml
	app/views/shared/_publisher.haml
	app/views/shared/_sub_header.haml
	app/views/users/edit.html.haml
	config/deploy_config.yml
	config/routes.rb
2010-09-27 15:39:50 -07:00
..
albums_controller.rb Merge branch 'master' into HEAD 2010-09-22 21:32:03 -07:00
application_controller.rb Merge branch 'master' of github.com:diaspora/diaspora into fb 2010-09-27 15:39:50 -07:00
aspects_controller.rb Merge branch 'master' of github.com:diaspora/diaspora into fb 2010-09-27 15:39:50 -07: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
services_controller.rb putting the token in the warden session 2010-09-24 10:45:27 -07:00
sockets_controller.rb Remove consecutive empty lines 2010-09-25 12:06:39 -04:00
status_messages_controller.rb Merge branch 'master' of github.com:diaspora/diaspora into fb 2010-09-27 15:39:50 -07:00
users_controller.rb Merge branch 'master' of github.com:diaspora/diaspora into fb 2010-09-27 15:39:50 -07:00