diff options
| author | eal <eal@waifu.club> | 2018-06-05 21:18:25 +0000 |
|---|---|---|
| committer | eal <eal@waifu.club> | 2018-06-05 21:18:25 +0000 |
| commit | f9719b064c46491589fe0428f6dc7c27680c0020 (patch) | |
| tree | 39e9f2a0958dc612bf067b5fe7b69a8cb833fc57 /lib | |
| parent | 04c584391ccb726a2b4b08dfd82a1ee27f36d31b (diff) | |
| parent | b143694b987e21f9172631b8e44084f6f8e6330a (diff) | |
| download | pleroma-f9719b064c46491589fe0428f6dc7c27680c0020.tar.gz | |
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 (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 9d4e3d806..4252ac2fe 100644 --- 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) |