Merge branch 'fix/emoji-picker' into 'develop'
authoreal <eal@waifu.club>
Tue, 5 Jun 2018 21:18:25 +0000 (21:18 +0000)
committereal <eal@waifu.club>
Tue, 5 Jun 2018 21:18:25 +0000 (21:18 +0000)
commitf9719b064c46491589fe0428f6dc7c27680c0020
tree39e9f2a0958dc612bf067b5fe7b69a8cb833fc57
parent04c584391ccb726a2b4b08dfd82a1ee27f36d31b
parentb143694b987e21f9172631b8e44084f6f8e6330a
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
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex