Daniel Vincent Grippi e94b48e19a Merge branch 'master' of github.com:diaspora/diaspora into production ... Conflicts: app/models/user.rb		2010-09-15 15:55:18 -07:00
..
controllers	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-15 11:01:11 -07:00
helpers	License notices replaced	2010-09-15 10:58:48 -07:00
models	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-15 15:55:18 -07:00
uploaders	License notices replaced	2010-09-15 10:58:48 -07:00
views	MS fixed the login bug, deploying to master	2010-09-15 15:15:15 -07:00