diaspora/app/helpers
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_helper.rb
application_helper.rb
aspects_helper.rb
dashboards_helper.rb
error_messages_helper.rb
language_helper.rb
layout_helper.rb
people_helper.rb
photos_helper.rb
publics_helper.rb
requests_helper.rb
sockets_helper.rb
status_messages_helper.rb