diff options
| author | Dan Callahan <danc@element.io> | 2021-10-27 20:04:00 +0100 |
|---|---|---|
| committer | Dan Callahan <danc@element.io> | 2021-10-27 20:04:00 +0100 |
| commit | 0dffa9d0e096e5ff04768b2e06ce4acf92120486 (patch) | |
| tree | aa501e65702a3e3fb179c3a0c37dc15543637f72 /debian | |
| parent | Changelog (diff) | |
| parent | Annotate `log_function` decorator (#10943) (diff) | |
| download | synapse-0dffa9d0e096e5ff04768b2e06ce4acf92120486.tar.xz | |
Merge remote-tracking branch 'origin/develop' into shellcheck
Fixes a merge conflict with debian/changelog Signed-off-by: Dan Callahan <danc@element.io>
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index f68c993094..24842192b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ -matrix-synapse-py3 (1.45.1+nmu1) UNRELEASED; urgency=medium +matrix-synapse-py3 (1.47.0+nmu1) UNRELEASED; urgency=medium * Update scripts to pass Shellcheck lints. -- root <root@cae79a6e79d7> Fri, 22 Oct 2021 22:20:31 +0000 +matrix-synapse-py3 (1.46.0~rc1) stable; urgency=medium + + * New synapse release 1.46.0~rc1. + + -- Synapse Packaging team <packages@matrix.org> Tue, 26 Oct 2021 14:04:04 +0100 + matrix-synapse-py3 (1.45.1) stable; urgency=medium * New synapse release 1.45.1. |