Merge branch 'develop' into 5.8-dev

# Conflicts:
#	composer.lock
This commit is contained in:
James Cole
2022-08-03 05:40:31 +02:00
68 changed files with 572 additions and 646 deletions

View File

@@ -111,7 +111,10 @@ REDIS_PATH=
# use only when using 'tcp' or 'http' for REDIS_SCHEME. Leave empty otherwise.
REDIS_HOST=127.0.0.1
REDIS_PORT=6379
REDIS_PASSWORD=null
# Use only with Redis 6+ with proper ACL set. Leave empty otherwise.
REDIS_USERNAME=
REDIS_PASSWORD=
# always use quotes and make sure redis db "0" and "1" exists. Otherwise change accordingly.
REDIS_DB="0"