projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
5a6f54b
)
Merge branch 'fix/pleroma.nginx' into 'develop'
author
eal
<eal@waifu.club>
Mon, 15 Jan 2018 17:26:41 +0000
(17:26 +0000)
committer
eal
<eal@waifu.club>
Mon, 15 Jan 2018 17:26:41 +0000
(17:26 +0000)
Correct pleroma.nginx
See merge request pleroma/pleroma!46
installation/pleroma.nginx
patch
|
blob
|
history
diff --git
a/installation/pleroma.nginx
b/installation/pleroma.nginx
index 4e88a426ddfc162887e2c49b86879c54c576daab..92ed8f32ea8cd15c148db8b9548cc016dabf01a3 100644
(file)
--- a/
installation/pleroma.nginx
+++ b/
installation/pleroma.nginx
@@
-34,6
+34,4
@@
server {
proxy_pass http://localhost:4000;
}
- include snippets/well-known.conf;
-
}