Merge branch 'next-minor' into develop

2016-11-28 02:55:14 +01:00 · 2016-11-28 02:55:14 +01:00 · c1e583cffd
commit c1e583cffd
parent 855b148ba5 60d49eb423
1 changed files with 1 additions and 2 deletions
--- a/app/views/conversations/_show.haml
+++ b/app/views/conversations/_show.haml
@ -25,5 +25,4 @@
  - for participant in conversation.participants
    = person_image_link(participant, :size => :thumb_small)

-.stream
-  = render partial: 'messages', locals: { conversation: conversation }
+= render partial: "messages", locals: {conversation: conversation}