ilya 2c9c4b0e14 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: app/views/invitations/_new.haml		2010-10-15 14:36:49 -07:00
..
controllers	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-15 14:36:49 -07:00
helpers	fixing some of the invite copy	2010-10-15 11:11:25 -07:00
models	requests are made on invite but perhaps they should be made on signup so that we have a person	2010-10-14 18:12:18 -07:00
uploaders	Add or later to license notice	2010-10-07 16:25:34 -07:00
views	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-15 14:36:49 -07:00