diaspora/app/views/conversations
MrZYX 93be252b59 Merge branch 'css-rtl'
Conflicts:
	public/javascripts/application.js
	public/javascripts/inbox.js
2011-04-11 21:52:01 +02:00
..
_conversation.haml Merge branch 'css-rtl' 2011-04-11 21:52:01 +02:00
_show.haml Merge branch 'css-rtl' 2011-04-11 21:52:01 +02:00
index.haml fixed a translation, keep up the new format in en.yml, set pagination labels in application controller 2011-03-19 14:04:11 +01:00
new.haml disable duplicate sending of a private message 2011-04-04 10:09:53 -07:00
show.haml fixed #992 2011-04-03 14:57:30 +02:00
show.js.erb fixed #992 2011-04-03 14:57:30 +02:00