Merge branch 'master' into develop

This commit is contained in:
Richard van der Hoff 2019-03-01 10:58:39 +00:00
commit 1beebe916f
3 changed files with 6 additions and 6 deletions

View file

@ -1,5 +1,5 @@
Synapse 0.99.2rc1 (2019-02-27) Synapse 0.99.2 (2019-03-01)
============================== ===========================
Features Features
-------- --------

6
debian/changelog vendored
View file

@ -1,9 +1,9 @@
matrix-synapse-py3 (0.99.2rc1) stable; urgency=medium matrix-synapse-py3 (0.99.2) stable; urgency=medium
* Fix overwriting of config settings on upgrade. * Fix overwriting of config settings on upgrade.
* New synapse release 0.99.2rc1. * New synapse release 0.99.2.
-- Synapse Packaging team <packages@matrix.org> Wed, 27 Feb 2019 10:45:58 +0000 -- Synapse Packaging team <packages@matrix.org> Fri, 01 Mar 2019 10:55:08 +0000
matrix-synapse-py3 (0.99.1.1) stable; urgency=medium matrix-synapse-py3 (0.99.1.1) stable; urgency=medium

View file

@ -27,4 +27,4 @@ try:
except ImportError: except ImportError:
pass pass
__version__ = "0.99.2rc1" __version__ = "0.99.2"