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
..
_new_aspect.haml	Translating a huge amount of untranslated strings	2010-10-30 15:25:42 +02:00
_no_friends_message.haml	fixed no friends/posts message positioning	2010-10-19 12:28:54 -07:00
_no_posts_message.haml	fixed no friends/posts message positioning	2010-10-19 12:28:54 -07:00
index.html.haml	killed albums	2010-11-04 10:17:19 -07:00
manage.html.haml	Merge remote branch 'MrZYX/untranslated-strings'	2010-11-04 20:05:57 -07:00
show.html.haml	killed albums	2010-11-04 10:17:19 -07:00