summary refs log tree commit diff
diff options
context:
space:
mode:
authorNeil Johnson <neil@fragile.org.uk>2018-04-13 12:14:57 +0100
committerNeil Johnson <neil@fragile.org.uk>2018-04-13 12:14:57 +0100
commiteb53439c4a4fbfc8714a187f3491a3bac584eae5 (patch)
tree76819ae12bd81f1b1b5c474ea8c5609c9a568995
parentMerge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse (diff)
parentBump version and Change log (diff)
downloadsynapse-eb53439c4a4fbfc8714a187f3491a3bac584eae5.tar.xz
Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse
Diffstat (limited to '')
-rw-r--r--CHANGES.rst8
-rw-r--r--synapse/__init__.py2
-rw-r--r--synapse/python_dependencies.py2
3 files changed, 10 insertions, 2 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index a838c092fe..19b7af606b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+Changes in synapse v0.27.4 (2018-04-13)
+======================================
+
+Changes:
+
+* Update canonicaljson dependency (#3095)
+
+
 Changes in synapse v0.27.3 (2018-04-11)
 ======================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 1fa2de5268..0c1c16b9a4 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.27.3"
+__version__ = "0.27.4"
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index 40eedb63cb..5cabf7dabe 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -22,7 +22,7 @@ REQUIREMENTS = {
     "jsonschema>=2.5.1": ["jsonschema>=2.5.1"],
     "frozendict>=0.4": ["frozendict"],
     "unpaddedbase64>=1.1.0": ["unpaddedbase64>=1.1.0"],
-    "canonicaljson>=1.0.0": ["canonicaljson>=1.0.0"],
+    "canonicaljson>=1.1.3": ["canonicaljson>=1.1.3"],
     "signedjson>=1.0.0": ["signedjson>=1.0.0"],
     "pynacl>=1.2.1": ["nacl>=1.2.1", "nacl.bindings"],
     "service_identity>=1.0.0": ["service_identity>=1.0.0"],