diff options
| author | lambda <pleromagit@rogerbraun.net> | 2017-11-07 20:01:15 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2017-11-07 20:01:15 +0000 |
| commit | be67db55475f2dc44590680242e116d3d0d4c1ec (patch) | |
| tree | b1158c7bd2df8dcfab9ffbe322cc5629f5be60cb /lib/pleroma/web/twitter_api/controllers/util_controller.ex | |
| parent | d761b1543af537fb6f1013c0930449c7c6a26941 (diff) | |
| parent | c6210183e1d52b22133560eb31306919470e7a73 (diff) | |
| download | pleroma-be67db55475f2dc44590680242e116d3d0d4c1ec.tar.gz | |
Merge branch 'mastodon-emoji-endpoint' into 'develop'
Add mastodon API endpoint for custom emoji.
See merge request pleroma/pleroma!8
Diffstat (limited to 'lib/pleroma/web/twitter_api/controllers/util_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/controllers/util_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex index 792ae2a64..de2abd4d1 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -71,6 +71,6 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do end def emoji(conn, _params) do - json conn, Formatter.get_custom_emoji() + json conn, Enum.into(Formatter.get_custom_emoji(), %{}) end end |