Merge remote-tracking branch 'origin/develop' into global-status-expiration

[akkoma] / lib / pleroma / plugs / trailing_format_plug.ex

diff --git a/lib/pleroma/plugs/trailing_format_plug.ex b/lib/pleroma/plugs/trailing_format_plug.ex
index 2473e07fe4a1a08f1f9648c30bf99ded8c2237f5..8b4d5fc9fe29eb3f022c67bea1427d8e07d45cbb 100644 (file)
--- a/lib/pleroma/plugs/trailing_format_plug.ex
+++ b/lib/pleroma/plugs/trailing_format_plug.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Plugs.TrailingFormatPlug do
@@ -23,7 +23,9 @@ defmodule Pleroma.Plugs.TrailingFormatPlug do
     "/nodeinfo",
     "/api/help",
     "/api/externalprofile",
-    "/notice"
+    "/notice",
+    "/api/pleroma/emoji",
+    "/api/oauth_tokens"
   ]
 
   def init(opts) do