mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-23 00:26:30 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
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
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View file

@ -136,6 +136,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
%{
"shortcode" => shortcode,
"static_url" => url,
"visible_in_picker" => true,
"url" => url
}
end)