diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2018-04-13 17:07:54 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2018-04-13 17:07:54 +0100 |
| commit | 154b44c2498f021c045d98635b22ce3f706592da (patch) | |
| tree | 791cf9baf7b7d1f100413ec608d9051ce6b44d38 | |
| parent | Merge pull request #3099 from matrix-org/matthew/fix-federation-domain-whitelist (diff) | |
| parent | Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse (diff) | |
| download | synapse-154b44c2498f021c045d98635b22ce3f706592da.tar.xz | |
Merge branch 'master' of https://github.com/matrix-org/synapse into develop
| -rw-r--r-- | CHANGES.rst | 8 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/python_dependencies.py | 2 |
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"], |