Merge branch 'fix/emoji-api-nonsense' into 'develop'
authorlambda <lain@soykaf.club>
Wed, 10 Apr 2019 06:22:51 +0000 (06:22 +0000)
committerlambda <lain@soykaf.club>
Wed, 10 Apr 2019 06:22:51 +0000 (06:22 +0000)
commitc8440b5e0c97c5d5c03e4b99e30a61df6ab95319
treeb52b9e6306b5e237fa3b5dbea375bf89f53d5c11
parent0ab563d3341f7cf9bb3e9f85a869499701cbb7d9
parentb57b43027cf958d3a3a82b95f155ae27b235b543
Merge branch 'fix/emoji-api-nonsense' into 'develop'

Change response format of /api/pleroma/emoji so it makes sense

See merge request pleroma/pleroma!1038
docs/api/pleroma_api.md
lib/pleroma/web/twitter_api/controllers/util_controller.ex
test/web/twitter_api/util_controller_test.exs