diff options
| author | Erik Johnston <erik@matrix.org> | 2016-02-10 17:06:53 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-02-10 17:06:53 +0000 |
| commit | 7718303e71d6e8acc59df300d31d31c0cc058868 (patch) | |
| tree | a5d06450202f759b4a04aa702e710ed620c5dd9c | |
| parent | Update CHANGES (diff) | |
| parent | 0.13.1 (diff) | |
| download | synapse-7718303e71d6e8acc59df300d31d31c0cc058868.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
| -rw-r--r-- | CHANGES.rst | 7 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/python_dependencies.py | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index f1c67b20e0..199fb1384c 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,10 @@ +Changes in synapse v0.13.1 (2016-02-10) +======================================= + +* Bump matrix-angular-sdk (matrix web console) dependency to 0.6.8 to + pull in the fix for SYWEB-361 so that the default client can display + HTML messages again(!) + Changes in synapse v0.13.0 (2016-02-10) ======================================= diff --git a/synapse/__init__.py b/synapse/__init__.py index 426330cc21..8da62c7b07 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.13.0" +__version__ = "0.13.1" diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index a87628ed85..75bf3d13aa 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -39,7 +39,7 @@ REQUIREMENTS = { } CONDITIONAL_REQUIREMENTS = { "web_client": { - "matrix_angular_sdk>=0.6.6": ["syweb>=0.6.6"], + "matrix_angular_sdk>=0.6.8": ["syweb>=0.6.8"], } } |