diff options
author | Mathieu Velten <mathieuv@matrix.org> | 2023-03-14 17:43:26 +0100 |
---|---|---|
committer | Mathieu Velten <mathieuv@matrix.org> | 2023-03-14 17:43:26 +0100 |
commit | de92fb6a28e26d1cef21b9d3c179f5c3746846df (patch) | |
tree | 8e3a684b1e9228481dead3f1e69b7d864d76c5f7 | |
parent | Additional functionality for declaring worker types in Complement (#14921) (diff) | |
parent | 1.79.0 (diff) | |
download | synapse-de92fb6a28e26d1cef21b9d3c179f5c3746846df.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 |