ilya 2c9c4b0e14 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: app/views/invitations/_new.haml		2010-10-15 14:36:49 -07:00
..
_new.haml	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-15 14:36:49 -07:00
edit.html.haml	the users are now made with people	2010-10-08 15:40:42 -07:00
new.html.haml	DG MS; invite is now a lightbox on feed and manage pages	2010-10-11 14:16:24 -07:00