diaspora/app/views/people
danielvincent 385e1673ab Merge branch 'master' into getting-started
Conflicts:
	app/controllers/users_controller.rb
	app/views/users/_account.haml
	app/views/users/_profile.haml
2010-10-26 16:50:57 -07:00
..
_person.html.haml padding on stream fix. added add aspect button in aspect nav. 2010-10-19 12:10:22 -07:00
edit.html.haml Merge branch 'master' into getting-started 2010-10-26 16:50:57 -07:00
index.html.haml default user picture change. stream link on all aspects page fix. layout view is not fragmented. 2010-10-19 11:29:29 -07:00
show.html.haml fixed translation showing en on person show page when the person had no posts 2010-10-20 17:52:07 -07:00