Merge remote-tracking branch 'pleroma/develop' into alias-router-helpers

This commit is contained in:
Alex Gleason 2021-05-19 12:49:00 -05:00
commit ad7d4ff8bc
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
174 changed files with 5125 additions and 1278 deletions

View file

@ -32,6 +32,7 @@ defmodule Pleroma.Web.Feed.FeedView do
%{
activity: activity,
object: object,
data: Map.get(object, :data),
actor: actor
}