Merge branch 'feature/upload-limits' into 'develop'
authorkaniini <nenolod@gmail.com>
Mon, 29 Oct 2018 20:14:10 +0000 (20:14 +0000)
committerkaniini <nenolod@gmail.com>
Mon, 29 Oct 2018 20:14:10 +0000 (20:14 +0000)
configurable media upload limits

Closes #118

See merge request pleroma/pleroma!401

1  2 
config/config.exs

Simple merge