Merge remote-tracking branch 'upstream/master' into extend-nginx

2018-12-07 16:48:50 +02:00
parent 97d338e68a 7f46876b0c
commit c00910ca4b
85 changed files with 2283 additions and 645 deletions
--- a/docs/compose/.env
+++ b/docs/compose/.env
@@ -61,6 +61,7 @@ ANTIVIRUS=none

 # Message size limit in bytes
 # Default: accept messages up to 50MB
+# Max attachment size will be 33% smaller
 MESSAGE_SIZE_LIMIT=50000000

 # Networks granted relay permissions, make sure that you include your Docker