diaspora/app/controllers
Raphael d753e31205 Merge remote branch 'ed0h/309-user-choose-language'
Add explicit language set to spec in users_controller_spec.rb

Conflicts:
	app/models/user.rb
2010-10-29 12:06:14 -07:00
..
albums_controller.rb
application_controller.rb add some basic verification when loading the languages config file 2010-10-28 18:09:25 +02:00
aspects_controller.rb
comments_controller.rb
dev_utilities_controller.rb
invitations_controller.rb
people_controller.rb
photos_controller.rb
publics_controller.rb
registrations_controller.rb
requests_controller.rb
services_controller.rb
sockets_controller.rb
status_messages_controller.rb
users_controller.rb allow user to change his language in his settings 2010-10-28 17:29:17 +02:00