diaspora/app/views/status_messages
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
..
_status_message.haml adjust column width, leading, serifs, etc. in stream for better readability. 2011-02-13 15:27:14 -08:00
create.js.erb Merge branch 'private_messages' 2011-03-08 21:23:41 -08:00
show.html.haml posts now have authors instead of people 2011-03-01 18:05:05 -08:00
show.mobile.haml Merge branch 'private_messages' 2011-03-08 21:23:41 -08:00