Revert "Merge branch 'features/hashtag-column' into 'develop'"
This reverts merge request !2824
This commit is contained in:
parent
b122b6ffa3
commit
3966add048
24 changed files with 70 additions and 163 deletions
|
|
@ -32,7 +32,6 @@ 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