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
new.haml
show.haml
show.js.erb