Merge branch 'master' into develop

This commit is contained in:
Andrew Morgan 2019-07-25 15:19:22 +01:00
commit f16aa3a44b
3 changed files with 12 additions and 3 deletions

View File

@ -1,3 +1,9 @@
Synapse 1.2.0 (2019-07-25)
==========================
No significant changes.
Synapse 1.2.0rc2 (2019-07-24)
=============================

7
debian/changelog vendored
View File

@ -1,4 +1,4 @@
matrix-synapse-py3 (1.1.0-1) UNRELEASED; urgency=medium
matrix-synapse-py3 (1.2.0) stable; urgency=medium
[ Amber Brown ]
* Update logging config defaults to match API changes in Synapse.
@ -6,7 +6,10 @@ matrix-synapse-py3 (1.1.0-1) UNRELEASED; urgency=medium
[ Richard van der Hoff ]
* Add Recommends and Depends for some libraries which you probably want.
-- Erik Johnston <erikj@rae> Thu, 04 Jul 2019 13:59:02 +0100
[ Synapse Packaging team ]
* New synapse release 1.2.0.
-- Synapse Packaging team <packages@matrix.org> Thu, 25 Jul 2019 14:10:07 +0100
matrix-synapse-py3 (1.1.0) stable; urgency=medium

View File

@ -35,4 +35,4 @@ try:
except ImportError:
pass
__version__ = "1.2.0rc2"
__version__ = "1.2.0"