maxwell 1adf93ace1 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: config/locales/diaspora/en.yml		2010-11-22 16:40:01 -08:00
..
_step_1.html.haml	translatable status is good again	2010-11-22 22:30:37 +01:00
_step_2.html.haml	remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar	2010-11-22 16:38:10 -08:00
_step_3.html.haml	Stream is a class	2010-11-21 13:21:42 -05:00
_step_4.html.haml	translatable status is good again	2010-11-22 22:30:37 +01:00