aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/endpoint.ex
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-12-17 19:30:05 +0000
committerlambda <pleromagit@rogerbraun.net>2018-12-17 19:30:05 +0000
commit078b8b6d228bee28697fda4bbefe65736f8b0d3c (patch)
tree5ab5ffc319a32beaa954af9f6f216642651c444d /lib/pleroma/web/endpoint.ex
parent567359790ea623949585629c41580961c59a01ff (diff)
parentba9ef77b6ae7fd6ade9eb87a418f9c87c7d94647 (diff)
downloadpleroma-078b8b6d228bee28697fda4bbefe65736f8b0d3c.tar.gz
Merge branch 'phoenix14' into 'develop'
Upgrade to Phoenix 1.4 Closes #451 See merge request pleroma/pleroma!560
Diffstat (limited to 'lib/pleroma/web/endpoint.ex')
-rw-r--r--lib/pleroma/web/endpoint.ex2
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex
index c5f9d51d9..e52667c72 100644
--- a/lib/pleroma/web/endpoint.ex
+++ b/lib/pleroma/web/endpoint.ex
@@ -3,8 +3,6 @@ defmodule Pleroma.Web.Endpoint do
socket("/socket", Pleroma.Web.UserSocket)
- socket("/api/v1", Pleroma.Web.MastodonAPI.MastodonSocket)
-
# Serve at "/" the static files from "priv/static" directory.
#
# You should set gzip to true if you are running phoenix.digest