diff options
author | lain <lain@soykaf.club> | 2018-04-02 13:15:38 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2018-04-02 13:15:38 +0200 |
commit | cd543d58a1b8ddf0f41a39800dc7a18321cd3250 (patch) | |
tree | 3bafc7d6c40258d1dc56c7539c8e11c25e9f1e22 /config | |
parent | 0a14d155d6a55366449bc8dea638e24200bb3dd0 (diff) | |
parent | 7130e9ddb16286efd7d01088e816f05e82cfa2a1 (diff) | |
download | pleroma-cd543d58a1b8ddf0f41a39800dc7a18321cd3250.tar.gz pleroma-cd543d58a1b8ddf0f41a39800dc7a18321cd3250.zip |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Diffstat (limited to 'config')
-rw-r--r-- | config/config.exs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 7bdd65259..68c054457 100644 --- a/config/config.exs +++ b/config/config.exs @@ -50,6 +50,7 @@ config :pleroma, :instance, name: "Pleroma", email: "example@example.com", limit: 5000, + upload_limit: 16_000_000, registrations_open: true, federating: true |