diaspora/app/views/people
Jonne Haß b8128d356b Merge branch 'hotfix/0.0.2.4' into develop
Conflicts:
	Changelog.md
	app/views/people/show.html.haml
	config/defaults.yml
	spec/helpers/layout_helper_spec.rb
2013-02-01 22:24:37 +01:00
..
_add_contact.html.haml
_aspect_membership_dropdown.haml
_index.html.haml
_person.html.haml
_person.mobile.haml
_profile_sidebar.html.haml
_relationship_action.haml
_sub_header.html.haml
contacts.haml
index.html.haml
index.mobile.haml
show.html.haml Merge branch 'hotfix/0.0.2.4' into develop 2013-02-01 22:24:37 +01:00
show.mobile.haml
tag_index.js.erb