Merge branch 'fix-nginx-listen-missing-ipv4' into 'develop'
authorkaniini <nenolod@gmail.com>
Tue, 26 Feb 2019 16:47:18 +0000 (16:47 +0000)
committerkaniini <nenolod@gmail.com>
Tue, 26 Feb 2019 16:47:18 +0000 (16:47 +0000)
commitb985c91431cf69d5476fa2cad29a7be0af63186a
tree57e43271f20bae08fb38a9df7fdcb964a7a3f018
parent03afee3fd11116d7deef256bd2b0de22526ff5b5
parente1bdaaa3fe20ad10458afa5edfb161fedcea74c0
Merge branch 'fix-nginx-listen-missing-ipv4' into 'develop'

need to put back ipv4 listen instruct

See merge request pleroma/pleroma!866