Merge branch 'nginx-cfg' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Tue, 26 Feb 2019 06:56:29 +0000 (06:56 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Tue, 26 Feb 2019 06:56:29 +0000 (06:56 +0000)
commit03afee3fd11116d7deef256bd2b0de22526ff5b5
tree426d64055f563f5033b06e303958e1726a460ce7
parent2ed7003c26c68cb8c1b2061435df17430287f243
parentd3a6c065a496c3a7c4f0604af646b6fb611f585b
Merge branch 'nginx-cfg' into 'develop'

Add ipv6 handling to pleroma.nginx

See merge request pleroma/pleroma!865