diff options
author | Erik Johnston <erik@matrix.org> | 2014-12-03 18:03:42 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-12-03 18:03:42 +0000 |
commit | 370cd9011ed1cf15af0b12a7cc1e9d1e110aaf0d (patch) | |
tree | 6cfacc683f68a9e9748058335c36e8ee2fa7f83d | |
parent | Fix bug where did not always resolve all the deferreds in _attempt_new_transa... (diff) | |
parent | Bump changes and version (diff) | |
download | synapse-370cd9011ed1cf15af0b12a7cc1e9d1e110aaf0d.tar.xz |
Merge branch 'release-v0.5.4' of github.com:matrix-org/synapse into develop
-rw-r--r-- | CHANGES.rst | 8 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | synapse/__init__.py | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 477a404721..2c57a57a01 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,11 @@ +Changes in synapse 0.5.4 (2014-12-03) +===================================== + + * Fix presence bug where some rooms did not display presence updates for + remote users. + * Do not log SQL timing log lines when started with "-v" + * Fix potential memory leak. + Changes in synapse 0.5.3c (2014-12-02) ====================================== diff --git a/VERSION b/VERSION index b6f145ad19..7d8568351b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.5.3c +0.5.4 diff --git a/synapse/__init__.py b/synapse/__init__.py index 0b43932305..723e15d506 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a synapse home server. """ -__version__ = "0.5.3c" +__version__ = "0.5.4" |