Merge 'upstream/master'

1 files changed, 2 insertions, 0 deletions

diff --git a/main/src/ui/conversation_content_view/content_populator.vala b/main/src/ui/conversation_content_view/content_populator.vala
index ef859bde..4d1b8c90 100644
--- a/main/src/ui/conversation_content_view/content_populator.vala
+++ b/main/src/ui/conversation_content_view/content_populator.vala
@@ -70,6 +70,8 @@ public class ContentProvider : ContentItemCollection, Object {
             return new FileMetaItem(content_item, stream_interactor);
         } else if (content_item.type_ == CallItem.TYPE) {
             return new CallMetaItem(content_item, stream_interactor);
+        } else if (content_item.type_ == FileGroupItem.TYPE) {
+            return new FileGroupMetaItem(content_item, stream_interactor);
         }
         critical("Got unknown content item type %s", content_item.type_);
         return null;