nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/controllers
History
Daniel Vincent Grippi c1a9a89be7 Merge branch 'production' of github.com:diaspora/diaspora into production 
Conflicts:
	app/models/user.rb
	config/deploy.rb
	spec/factories.rb
	spec/models/request_spec.rb
	spec/spec_helper.rb
2010-09-14 11:08:18 -07:00
..
albums_controller.rb DG, RS; Album creation no longer ejects you from context 2010-09-14 11:00:16 -07:00
application_controller.rb DG, RS; Album creation no longer ejects you from context 2010-09-14 11:00:16 -07:00
aspects_controller.rb RS, DG; display the correct tab on manage, change edit to manage 2010-09-14 10:05:59 -07:00
comments_controller.rb added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
dev_utilities_controller.rb added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
people_controller.rb added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
photos_controller.rb flash messages are now being set. 2010-09-13 15:44:26 -07:00
publics_controller.rb added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
requests_controller.rb MS IZ removed a bunch of unused request stuff 2010-09-13 16:58:23 -07:00
sockets_controller.rb added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
status_messages_controller.rb added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
users_controller.rb Merge branch 'production' of github.com:diaspora/diaspora into production 2010-09-14 11:08:18 -07:00