diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-09-05 19:23:52 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-09-05 19:23:52 +0000 |
| commit | 592ce8a74f1db0dee2e98e5f8e96a11bbadabcfe (patch) | |
| tree | 1535db820c09a3564a48f8443c931d2f628d5905 | |
| parent | fe7cf44c405ae2872d8d978f566bbb8e6fba0480 (diff) | |
| parent | 3523bdcf262dddc7bdf14d759538097f8838cddb (diff) | |
| download | pleroma-592ce8a74f1db0dee2e98e5f8e96a11bbadabcfe.tar.gz pleroma-592ce8a74f1db0dee2e98e5f8e96a11bbadabcfe.zip | |
Merge branch 'hotifx/emoji-trailing' into 'develop'
Call TrailingFormatPlug for /api/pleroma/emoji
See merge request pleroma/pleroma!1634
| -rw-r--r-- | lib/pleroma/plugs/trailing_format_plug.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/plugs/trailing_format_plug.ex b/lib/pleroma/plugs/trailing_format_plug.ex index 2473e07fe..ce366b218 100644 --- a/lib/pleroma/plugs/trailing_format_plug.ex +++ b/lib/pleroma/plugs/trailing_format_plug.ex @@ -23,7 +23,8 @@ defmodule Pleroma.Plugs.TrailingFormatPlug do "/nodeinfo", "/api/help", "/api/externalprofile", - "/notice" + "/notice", + "/api/pleroma/emoji" ] def init(opts) do |