Merge branch 'next-minor' into develop

This commit is contained in:
Benjamin Neff 2016-11-28 02:55:14 +01:00
commit c1e583cffd

View file

@ -25,5 +25,4 @@
- for participant in conversation.participants - for participant in conversation.participants
= person_image_link(participant, :size => :thumb_small) = person_image_link(participant, :size => :thumb_small)
.stream = render partial: "messages", locals: {conversation: conversation}
= render partial: 'messages', locals: { conversation: conversation }