summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-03-15 23:57:26 +0000
committerErik Johnston <erik@matrix.org>2018-03-15 23:57:26 +0000
commitba48755d56ba134590f7b5dcb5da44371639fc4c (patch)
treec523c03ec6f936c24ca55888bd18741699f5084a
parentReplace ujson with simplejson (diff)
downloadsynapse-ba48755d56ba134590f7b5dcb5da44371639fc4c.tar.xz
Bump version and changelog
-rw-r--r--CHANGES.rst8
-rw-r--r--synapse/__init__.py2
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst

index dcf9adc95c..38ba4249b8 100644 --- a/CHANGES.rst +++ b/CHANGES.rst
@@ -1,3 +1,11 @@ +Changes in synapse v0.26.1 (2018-03-15) +======================================= + +Bug fixes: + +* Fix bug where an invalid event caused server to stop functioning correctly, + due to parsing and serializing bugs in ujson library. + Changes in synapse v0.26.0 (2018-01-05) ======================================= diff --git a/synapse/__init__.py b/synapse/__init__.py
index ef8853bd24..80efad3a65 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.26.0" +__version__ = "0.26.1"