danielvincent fa66162de5 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: app/helpers/application_helper.rb app/views/comments/_comment.html.haml app/views/people/_person.html.haml app/views/shared/_stream_element.html.haml		2010-11-30 13:19:17 -08:00
..
controllers	Clean up people/person	2010-11-30 13:07:02 -08:00
helpers	Merge branch 'master' of github.com:diaspora/diaspora	2010-11-30 13:19:17 -08:00
mailers	Person#real_name -> Person#name	2010-11-30 13:01:53 -08:00
models	Person#real_name -> Person#name	2010-11-30 13:01:53 -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-11-30 13:19:17 -08:00