summaryrefslogtreecommitdiff
path: root/installation
diff options
context:
space:
mode:
authorminibikini <egor@kislitsyn.com>2020-11-18 20:22:40 +0000
committerminibikini <egor@kislitsyn.com>2020-11-18 20:22:40 +0000
commit6669ac5bf7749be325a10f92cc9eed49c6be2761 (patch)
tree107cd84c2a05d80f684f7d7ec1608fb4f6d3c606 /installation
parent1d03ba4ffbb73b54a7caa107a6b9a85fa65ecfd4 (diff)
parenta1056aace19d5f6201f06937a93f978917df8418 (diff)
downloadpleroma-6669ac5bf7749be325a10f92cc9eed49c6be2761.tar.gz
pleroma-6669ac5bf7749be325a10f92cc9eed49c6be2761.zip
Merge branch 'develop' into 'hide-muted-reactions'
# Conflicts: # CHANGELOG.md
Diffstat (limited to 'installation')
-rw-r--r--installation/pleroma.nginx5
1 files changed, 0 insertions, 5 deletions
diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index d613befd2..9890cb2b1 100644
--- a/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@ -93,9 +93,4 @@ server {
chunked_transfer_encoding on;
proxy_pass http://phoenix;
}
-
- location /api/fedsocket/v1 {
- proxy_request_buffering off;
- proxy_pass http://phoenix/api/fedsocket/v1;
- }
}