diaspora/app/views/people
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
..
_person.html.haml Clean up people/person 2010-11-30 13:07:02 -08:00
_profile_photo_upload.html.haml fixed build. publisher lights up on hover on aspect#index page. updated login page text. 2010-11-23 03:10:47 -08:00
_profile_sidebar.html.haml Person#real_name -> Person#name 2010-11-30 13:01:53 -08:00
edit.html.haml 1900 was too far back for rails, 1904 were accepted. 2010-11-27 14:13:29 +01:00
index.html.haml Clean up people/person 2010-11-30 13:07:02 -08:00
show.html.haml Person#real_name -> Person#name 2010-11-30 13:01:53 -08:00