diff options
author | Erik Johnston <erik@matrix.org> | 2021-07-23 09:19:24 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2021-07-23 09:19:24 +0100 |
commit | ab82fd6ed117d65b330648727dd262b88c94215c (patch) | |
tree | 52c3d57939ac2f7e08aec98c9f29160287eddc35 | |
parent | Merge tag 'v1.39.0rc2' into develop (diff) | |
parent | Merge tag 'v1.38.1' into release-v1.39 (diff) | |
download | synapse-ab82fd6ed117d65b330648727dd262b88c94215c.tar.xz |
Merge branch 'release-v1.39' into develop
-rw-r--r-- | .github/workflows/docker.yml | 2 | ||||
-rw-r--r-- | changelog.d/10461.misc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml |