maxwell 8fb97072df Merge branch '583-password-person-conflict' of https://github.com/flah00/diaspora into flah00-583-password-person-conflict		2010-12-04 18:40:17 -08:00
..
controllers	Merge branch 'master' of github.com:diaspora/diaspora	2010-12-04 17:39:19 -08:00
helpers	Final fixes for person socketing	2010-12-02 19:03:15 -08:00
mailers	made sender address in notifier.rb configurable. This fixes #657	2010-12-03 15:49:34 +01:00
models	Merge branch '583-password-person-conflict' of https://github.com/flah00/diaspora into flah00-583-password-person-conflict	2010-12-04 18:40:17 -08:00
uploaders	photo large is now at 300px. a person's profile photo now references the larger size instead of medium.	2010-11-22 10:32:14 -08:00
views	Merge branch 'master' of github.com:diaspora/diaspora	2010-12-04 17:39:19 -08:00