Merge remote-tracking branch 'pleroma/develop' into alias-router-helpers
This commit is contained in:
commit
ad7d4ff8bc
174 changed files with 5125 additions and 1278 deletions
|
|
@ -32,6 +32,7 @@ defmodule Pleroma.Web.Feed.FeedView do
|
|||
|
||||
%{
|
||||
activity: activity,
|
||||
object: object,
|
||||
data: Map.get(object, :data),
|
||||
actor: actor
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue