nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app
History
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
..
controllers Merge remote branch 'ed0h/309-user-choose-language' 2010-10-29 12:06:14 -07:00
helpers Merge remote branch 'ed0h/309-user-choose-language' 2010-10-29 12:06:14 -07:00
mailers update attachment with emails 2010-10-22 17:12:28 -07:00
models Merge remote branch 'ed0h/309-user-choose-language' 2010-10-29 12:06:14 -07:00
uploaders Add or later to license notice 2010-10-07 16:25:34 -07:00
views Merge remote branch 'ed0h/309-user-choose-language' 2010-10-29 12:06:14 -07:00