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
6 years ago · f9719b064c
parent 04c584391c b143694b98
commit f9719b064c
1 changed files with 1 additions and 0 deletions
--- 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)