Raphael 738e8c65c8 Merge almost complete, 4 failures		2011-01-14 16:00:10 -08:00
..
getting_started	Merge almost complete, 4 failures	2011-01-14 16:00:10 -08:00
edit.html.haml	Revert "Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email"	2010-12-13 17:16:56 -08:00
getting_started.html.haml	skip getting started is not ajaxy	2010-12-04 12:06:08 -08:00