diaspora/app/views/layouts
danielgrippi 1f5edb1d92 Merge branch 'private_messages'
Conflicts:
	app/controllers/status_messages_controller.rb
	app/models/data_point.rb
	app/models/status_message.rb
	db/schema.rb
	lib/fake.rb
	public/stylesheets/sass/application.sass
	spec/models/mention_spec.rb
2011-03-08 21:23:41 -08:00
..
_debug.haml Remove some old views, clean up routes, clean up. 2010-12-01 15:38:56 -08:00
_header.html.haml Merge branch 'private_messages' 2011-03-08 21:23:41 -08:00
application.html.haml link to public feed of the person on the profile person show page instead of to the one of current_user 2011-03-08 20:30:48 +01:00
application.mobile.haml wip, profiles controller and specs, with cucumber failures 2011-02-15 14:17:25 -08:00
notifier.html.haml Correct email picture url 2011-01-28 11:43:15 -08:00