Merge branch 'fix/emoji-picker' into 'develop'

set visible_in_picker to true in custom_emojis

Closes #177 and mastofe#16

See merge request pleroma/pleroma!188
This commit is contained in:
eal 2018-06-05 21:18:25 +00:00
commit f9719b064c

View file

@ -136,6 +136,7 @@ defp mastodonized_emoji do
%{ %{
"shortcode" => shortcode, "shortcode" => shortcode,
"static_url" => url, "static_url" => url,
"visible_in_picker" => true,
"url" => url "url" => url
} }
end) end)