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)
Fix max upload size in nginx config.

See merge request pleroma/pleroma!102


Trivial merge