commit: f9719b064c46491589fe0428f6dc7c27680c0020
parent: 04c584391ccb726a2b4b08dfd82a1ee27f36d31b
Author: eal <eal@waifu.club>
Date: Tue, 5 Jun 2018 21:18:25 +0000
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
Diffstat:
1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -136,6 +136,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
%{
"shortcode" => shortcode,
"static_url" => url,
+ "visible_in_picker" => true,
"url" => url
}
end)