diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-09-06 13:26:05 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-09-06 13:26:05 +0300 |
| commit | ca1ba1e272fd51ee1d9524a39da07b4b2f9e0b6e (patch) | |
| tree | 7a9d31d44f362ff903813925171a4c31942b8261 /lib/pleroma/web/endpoint.ex | |
| parent | 79cf629e1a3610a93f5b9349c18a4464eb859d3d (diff) | |
| parent | 896ffabe37406e85c2a3c2f30d2e882c68b5831e (diff) | |
| download | pleroma-ca1ba1e272fd51ee1d9524a39da07b4b2f9e0b6e.tar.gz | |
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
Diffstat (limited to 'lib/pleroma/web/endpoint.ex')
| -rw-r--r-- | lib/pleroma/web/endpoint.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex index c123530dc..eb805e853 100644 --- a/lib/pleroma/web/endpoint.ex +++ b/lib/pleroma/web/endpoint.ex @@ -57,7 +57,7 @@ defmodule Pleroma.Web.Endpoint do plug(Phoenix.CodeReloader) end - plug(TrailingFormatPlug) + plug(Pleroma.Plugs.TrailingFormatPlug) plug(Plug.RequestId) plug(Plug.Logger) |