Raphael 04594d7ac5 Merge branch 'production' of github.com:diaspora/diaspora into production ... Conflicts: app/models/user.rb		2010-09-15 17:25:14 -07:00
..
controllers	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-15 17:24:00 -07:00
helpers	License notices replaced	2010-09-15 10:58:48 -07:00
models	Merge branch 'production' of github.com:diaspora/diaspora into production	2010-09-15 17:25:14 -07:00
uploaders	License notices replaced	2010-09-15 10:58:48 -07:00
views	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-15 17:05:36 -07:00