danielvincent d6bb5291bc Revert "Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email" ... This reverts commit 2ac54eeffe, reversing changes made to 3a13657087.		2010-12-13 17:16:56 -08:00
..
controllers	Revert "Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email"	2010-12-13 17:16:56 -08:00
helpers	put remove contact link under aspect membership	2010-12-13 16:40:05 -08:00
mailers	fix a bug with the notifier and attachment	2010-12-13 14:28:21 -08:00
models	Revert "Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email"	2010-12-13 17:16:56 -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	Revert "Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email"	2010-12-13 17:16:56 -08:00