diff options
author | Richard van der Hoff <richard@matrix.org> | 2020-08-18 18:13:47 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2020-08-18 18:13:47 +0100 |
commit | afe4c4e02e539861e36d6e080f2f5e33bd58f20d (patch) | |
tree | abdef0313e40eec69fbd5d182cbe05fac44d11ed /debian/changelog | |
parent | Merge branch 'develop' into matrix-org-hotfixes (diff) | |
parent | Add resources.consent conditional dependency back (#8107) (diff) | |
download | synapse-afe4c4e02e539861e36d6e080f2f5e33bd58f20d.tar.xz |
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'debian/changelog')
-rw-r--r-- | debian/changelog | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog |