diff options
author | Erik Johnston <erik@matrix.org> | 2023-06-20 18:56:18 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2023-06-20 18:56:18 +0100 |
commit | 1fcefd8f3ea6bbca769b1ca8937f8cf5e17239d5 (patch) | |
tree | b4dfb994f682502244149638f2662f42d163114b | |
parent | Fix Sytest environmental variable evaluation in CI (#15804) (diff) | |
parent | 1.86.0 (diff) | |
download | synapse-1fcefd8f3ea6bbca769b1ca8937f8cf5e17239d5.tar.xz |
Merge branch 'master' into develop
-rw-r--r-- | CHANGES.md | 6 | ||||
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | pyproject.toml | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md |