diff options
| author | eal <eal@waifu.club> | 2018-01-15 17:26:41 +0000 |
|---|---|---|
| committer | eal <eal@waifu.club> | 2018-01-15 17:26:41 +0000 |
| commit | db5dfd1b3eaadb7ecc07cf496c97901f4c8bc7d4 (patch) | |
| tree | 246ac49cdbe0b455ade044b350e319bff0506174 | |
| parent | 5a6f54b336c8cca7f6514bb9ce7db5b6c97f296f (diff) | |
| parent | aceef36e5675253b32b0be4322b055e98a0154e7 (diff) | |
| download | pleroma-db5dfd1b3eaadb7ecc07cf496c97901f4c8bc7d4.tar.gz | |
Merge branch 'fix/pleroma.nginx' into 'develop'
Correct pleroma.nginx
See merge request pleroma/pleroma!46
| -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; - } |