maxwell 1adf93ace1 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: config/locales/diaspora/en.yml		2010-11-22 16:40:01 -08:00
..
getting_started	Merge branch 'master' of github.com:diaspora/diaspora	2010-11-22 16:40:01 -08:00
edit.html.haml	added diaspora handle to home page with help text. added email address to account settings page.	2010-11-22 11:19:50 -08:00
getting_started.html.haml	translatable status is good again	2010-11-22 22:30:37 +01:00