summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-04-01 08:36:48 +0000
committerlambda <pleromagit@rogerbraun.net>2018-04-01 08:36:48 +0000
commit1dcc700cca378f813b8f232e26c0f6f494a8336e (patch)
treea685333f9814db3447d4920574b3a8ea35c0463c /config
parent5fa8237bc1dcabca050dc5d8d9325fec649e1723 (diff)
parent4bf86d4cf5b3641fb37013165442cb0f5e3ab591 (diff)
downloadpleroma-1dcc700cca378f813b8f232e26c0f6f494a8336e.tar.gz
pleroma-1dcc700cca378f813b8f232e26c0f6f494a8336e.zip
Merge branch 'feature/upload-limit' into 'develop'
config: make the upload limit configurable See merge request pleroma/pleroma!88
Diffstat (limited to 'config')
-rw-r--r--config/config.exs1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs
index 151c6b826..cf8d6c2b7 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -49,6 +49,7 @@ config :pleroma, :instance,
name: "Pleroma",
email: "example@example.com",
limit: 5000,
+ upload_limit: 16_000_000,
registrations_open: true,
federating: true