hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into 'cleanup/masto_fe-default_settings'

Browse source 
# Conflicts:
#   lib/pleroma/web/views/masto_fe_view.ex
This commit is contained in:
lain 2020-07-27 16:35:47 +00:00
commit e1a1c8e7de
520 changed files with 10366 additions and 5911 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/views/masto_fe_view.ex
View file

@ -56,7 +56,7 @@ defmodule Pleroma.Web.MastoFEView do
"video\/mp4"
]
},
settings: user.settings || %{},
settings: user.mastofe_settings || %{},
push_subscription: nil,
accounts: %{user.id => render(AccountView, "show.json", user: user, for: user)},
custom_emojis: render(CustomEmojiView, "index.json", custom_emojis: custom_emojis),