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_spec.rb
aspects_controller_spec.rb
dev_utilities_controller_spec.rb
people_controller_spec.rb
photos_controller_spec.rb
publics_controller_spec.rb	MS tests are now green	2010-10-29 11:16:50 -07:00
registrations_controller_spec.rb
requests_controller_spec.rb	IZ MS rebase master	2010-10-29 11:15:13 -07:00
services_controller_spec.rb
sockets_controller_spec.rb
status_message_controller_spec.rb
users_controller_spec.rb	Merge remote branch 'ed0h/309-user-choose-language'	2010-10-29 12:06:14 -07:00