Merge branch 'patch-3' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Tue, 29 May 2018 10:58:43 +0000 (10:58 +0000)
committerlambda <pleromagit@rogerbraun.net>
Tue, 29 May 2018 10:58:43 +0000 (10:58 +0000)
commit8bd7ace4203a06257eda19829a14e17e381724d9
treeb82b4cf53b25a90feb4d07646e372da3bbed5835
parent52b04137198cd87f814e51d94716d153f896fba9
parenta6fd9c4b0083889d327b0954febd7bb233dfccb1
Merge branch 'patch-3' into 'develop'

Update pleroma.nginx

See merge request pleroma/pleroma!179