diff options
| author | Roger Braun <rbraun@Bobble.local> | 2017-10-23 16:28:32 +0200 |
|---|---|---|
| committer | Roger Braun <rbraun@Bobble.local> | 2017-10-23 16:28:32 +0200 |
| commit | 5912dd0f5dfaecc3732d2174867490c5a6b88c11 (patch) | |
| tree | 49604bde6717dc628d85858d03a70824933cbb32 /lib/pleroma/web/twitter_api/controllers/util_controller.ex | |
| parent | 64bc38e009208fa4f4409f6930d5117dc291c2f5 (diff) | |
| parent | d0d50f8a6b1d22b4c45f7e2c2b2757d188f29349 (diff) | |
| download | pleroma-5912dd0f5dfaecc3732d2174867490c5a6b88c11.tar.gz | |
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
Diffstat (limited to 'lib/pleroma/web/twitter_api/controllers/util_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/controllers/util_controller.ex | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex index 11d8fa6c2..792ae2a64 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -1,6 +1,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do use Pleroma.Web, :controller alias Pleroma.Web + alias Pleroma.Formatter alias Pleroma.{Repo, PasswordResetToken, User} @@ -68,4 +69,8 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do _ -> json(conn, version) end end + + def emoji(conn, _params) do + json conn, Formatter.get_custom_emoji() + end end |