nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app
History
Raphael 1bba4c60f7 Merge remote branch 'MrZYX/untranslated-strings' 
Conflicts:
	app/views/aspects/manage.html.haml
	config/locales/diaspora/en.yml
2010-11-04 20:05:57 -07:00
..
controllers Merge remote branch 'MrZYX/untranslated-strings' 2010-11-04 20:05:57 -07:00
helpers killed albums 2010-11-04 10:17:19 -07:00
mailers mailer doesn't break everything anymore. attachments are also inlined. 2010-11-02 17:59:50 -07:00
models Fix 328 profile images dying, thanks to theBernd 2010-11-04 18:46:15 -07:00
uploaders the photo image url is now randomized 2010-11-04 14:37:08 -07:00
views Merge remote branch 'MrZYX/untranslated-strings' 2010-11-04 20:05:57 -07:00