Raphael 22f90086ca Merge branch 'master' of github.com:diaspora/diaspora		2010-10-05 16:58:06 -07:00
..
_profile.haml	Add translation support in profile ('or' between buttons). Fix Russian locale	2010-10-06 07:56:23 +08:00
_services.haml	Don't require a facebook yml	2010-10-05 16:57:22 -07:00
edit.html.haml	Merge branch 'master' of github.com:diaspora/diaspora into fb	2010-09-27 15:39:50 -07:00