diff options
author | Erik Johnston <erik@matrix.org> | 2019-10-29 15:52:39 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-10-29 15:52:39 +0000 |
commit | 74c1e16106fca0ec9126c3e218cd7763330c5cb0 (patch) | |
tree | b6c8f4148e647e0f11f7125f140954d023ed84d6 /debian/changelog | |
parent | Make concurrently_execute work with async/await (diff) | |
parent | Fix CI for synapse_port_db (#6276) (diff) | |
download | synapse-74c1e16106fca0ec9126c3e218cd7763330c5cb0.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/federation_server_async_await
Diffstat (limited to 'debian/changelog')
-rw-r--r-- | debian/changelog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog |