Merge branch 'feature/rich-media-limits' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Mon, 11 Feb 2019 12:33:58 +0000 (12:33 +0000)
committerlambda <pleromagit@rogerbraun.net>
Mon, 11 Feb 2019 12:33:58 +0000 (12:33 +0000)
rich media: tighten fetching timeouts and size limits

See merge request pleroma/pleroma!809


Trivial merge