diff options
| author |  Sebastiaan Zeeff <[email protected]> | 2019-10-15 15:54:20 +0200 |
|---|---|---|
| committer | Sebastiaan Zeeff <[email protected]> | 2019-10-15 15:54:20 +0200 |
| commit | f32341de7df58899e63cf1e885cfdf1b425c1195 (patch) | |
| tree | 22bdc38866a1fc42f6e017b2bb4b2df88ea99a2b /docker-compose.yml | |
| parent | Remove empty tests.cogs folder (diff) | |
| parent | Create the !mention command. (#493) (diff) | |
Merge branch 'master' into unittest-migration
Resolving merge conflicts from master in `.gitignore` and
`tests/helpers.py`.
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 9684a3c62..f79fdba58 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ version: "3.7" services: postgres: - image: postgres:11-alpine + image: postgres:12-alpine environment: POSTGRES_DB: pysite POSTGRES_PASSWORD: pysite |