Merge branch 'develop' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Mon, 9 Apr 2018 08:41:34 +0000 (08:41 +0000)
committerlambda <pleromagit@rogerbraun.net>
Mon, 9 Apr 2018 08:41:34 +0000 (08:41 +0000)
commit210755ac46d7f1b909b74c75e9c7cce4dd9df7ba
tree4c6acf26a7d0cd806adfff3ee6b5f4316e45bc0e
parent2d0a2d94663bb38319c6d75d91836c32f9ac178e
parent7e262c299736bece0d6ae5ad32c41892b45e6f6c
Merge branch 'develop' into 'develop'

Fix max upload size in nginx config.

See merge request pleroma/pleroma!102