diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-07 19:21:00 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-07 19:21:00 +0100 |
| commit | db0dca2f6f794e6f20718e935de0addd38fb008d (patch) | |
| tree | 909927195735705e300b6e049f21cbebe67847e1 /synapse | |
| parent | revert accidental bcrypt gensalt round reduction from loadtesting (diff) | |
| parent | Merge branch 'release-v0.9.0' of github.com:matrix-org/synapse (diff) | |
| download | synapse-db0dca2f6f794e6f20718e935de0addd38fb008d.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/python_dependencies.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 56c10a84e9..c89f444f4e 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.8.1-r4" +__version__ = "0.9.0" diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 0d0db4d543..a45dd3c93d 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -33,7 +33,7 @@ REQUIREMENTS = { } CONDITIONAL_REQUIREMENTS = { "web_client": { - "matrix_angular_sdk>=0.6.5": ["syweb>=0.6.5"], + "matrix_angular_sdk>=0.6.6": ["syweb>=0.6.6"], } } @@ -57,8 +57,8 @@ DEPENDENCY_LINKS = [ ), github_link( project="matrix-org/matrix-angular-sdk", - version="v0.6.5", - egg="matrix_angular_sdk-0.6.5", + version="v0.6.6", + egg="matrix_angular_sdk-0.6.6", ), ] |