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
..
getting_started	removing aspect in ui only if ok is clicked on confirmation	2010-11-04 19:54:11 -07:00
edit.html.haml	made flash messages translatable	2010-11-04 20:49:50 +01:00
getting_started.html.haml	removing aspect in ui only if ok is clicked on confirmation	2010-11-04 19:54:11 -07:00