diff options
author | Patrick Cloke <patrickc@matrix.org> | 2020-07-02 11:01:47 -0400 |
---|---|---|
committer | Patrick Cloke <patrickc@matrix.org> | 2020-07-02 11:02:42 -0400 |
commit | f2bcc6ecbfcb5e9486e3ab53dd41fd458d61587f (patch) | |
tree | d9f3c46ff7f20b373ee6b74562a8657718eea9ae /changelog.d | |
parent | Fix new metric where we used ms instead of seconds (#7771) (diff) | |
parent | Merge tag 'v1.15.2' (diff) | |
download | synapse-f2bcc6ecbfcb5e9486e3ab53dd41fd458d61587f.tar.xz |
Merge branch 'master' into release-v1.16.0
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`. |