Merge remote-tracking branch 'origin/release' into release
# Conflicts: # docker-compose.yml
This commit is contained in:
commit
be3e1ffb53
@ -8,7 +8,7 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
- PYTHONUNBUFFERED=1
|
- PYTHONUNBUFFERED=1
|
||||||
volumes:
|
volumes:
|
||||||
- ./docker-work/users:/users
|
- ./users:/users
|
||||||
- ./docker-work/backup:/backup
|
- ./backup:/backup
|
||||||
- ./docker-work/settings:/settings
|
- ./settings:/settings
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
Loading…
x
Reference in New Issue
Block a user