Raphael Sofaer 4fa5731d5e Merge remote branch 'jancborchardt/1410-messages-conversation' ... Conflicts: app/views/conversations/new.haml		2011-07-28 12:45:40 -07:00
..
_conversation.haml	Display unread post count for conversations in inbox, if appropriate.	2011-07-27 22:33:13 +02:00
_show.haml	Fix issue #1410, remove cancel button in messages conversation	2011-07-20 11:20:18 +02:00
index.haml	touch up message inbox view	2011-07-06 00:38:25 -07:00
new.haml	Merge remote branch 'jancborchardt/1410-messages-conversation'	2011-07-28 12:45:40 -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