diff options
author | Patrick Cloke <patrickc@matrix.org> | 2020-07-02 10:55:41 -0400 |
---|---|---|
committer | Patrick Cloke <patrickc@matrix.org> | 2020-07-02 10:55:41 -0400 |
commit | 4d978d7db4448e3cb526ee1087aeab578a31ac71 (patch) | |
tree | 872c47b3fb4843e720b4c785cbcb9e87a95779ae /changelog.d | |
parent | Hack to add push priority to push notifications (#7765) (diff) | |
parent | Merge tag 'v1.15.2' (diff) | |
download | synapse-4d978d7db4448e3cb526ee1087aeab578a31ac71.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'changelog.d')
-rw-r--r-- | changelog.d/7696.doc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/7696.doc b/changelog.d/7696.doc new file mode 100644 index 0000000000..d448bedc0b --- /dev/null +++ b/changelog.d/7696.doc @@ -0,0 +1 @@ +Update postgres image in example `docker-compose.yaml` to tag `12-alpine`. |