Merge branch 'master' into glitch-soc/merge-upstream

2018-10-08 13:51:33 +02:00
parent 96c3d26870 4c4ff05a46
commit d17844e6d1
58 changed files with 875 additions and 106 deletions
--- a/app/lib/inline_renderer.rb
+++ b/app/lib/inline_renderer.rb
@@ -13,6 +13,8 @@ class InlineRenderer
      serializer = REST::StatusSerializer
    when :notification
      serializer = REST::NotificationSerializer
+    when :conversation
+      serializer = REST::ConversationSerializer
    else
      return
    end