diff options
| author | Jeff Becker <jeff@i2p.rocks> | 2018-01-24 13:15:54 -0500 |
|---|---|---|
| committer | Jeff Becker <jeff@i2p.rocks> | 2018-01-24 13:15:54 -0500 |
| commit | dffde6631d105949b62c1ff27c22fefcb873b2e8 (patch) | |
| tree | f486f66ae4067ec1bc0dec7f265765b6d35a9c58 /installation | |
| parent | 1e185b9301ec85cd2aaeb1faf075aaa86f733373 (diff) | |
| parent | 0f722a8c223c1953c9c9fb45e73cc9ace92839e2 (diff) | |
| download | pleroma-dffde6631d105949b62c1ff27c22fefcb873b2e8.tar.gz | |
Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy
Diffstat (limited to 'installation')
| -rw-r--r-- | installation/pleroma.nginx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx index 4e88a426d..92ed8f32e 100644 --- a/installation/pleroma.nginx +++ b/installation/pleroma.nginx @@ -34,6 +34,4 @@ server { proxy_pass http://localhost:4000; } - include snippets/well-known.conf; - } |