diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-02-02 14:05:42 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-02-02 14:05:42 +0000 |
| commit | 6e856d772989efe3fabc49f84f966c6407071698 (patch) | |
| tree | d4cce2877b6b579e828a4a3cb22e91a4ab2dd05c | |
| parent | Ignore empty strings for display names & room names in notifications (diff) | |
| parent | fix OSX stuff and typos (diff) | |
| download | synapse-6e856d772989efe3fabc49f84f966c6407071698.tar.xz | |
Merge master into develop
Conflicts: README.rst setup.py
| -rw-r--r-- | VERSION | 2 | ||||
| -rwxr-xr-x | setup.py | 4 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/VERSION b/VERSION index 3b3e723172..1c29ff4d36 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.6.1b +0.6.1d diff --git a/setup.py b/setup.py index eb1d17c25f..28e8188f94 100755 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ setup( description="Reference Synapse Home Server", install_requires=[ "syutil==0.0.2", - "matrix_angular_sdk>=0.6.0", + "matrix_angular_sdk>=0.6.1", "Twisted==14.0.2", "service_identity>=1.0.0", "pyopenssl>=0.14", @@ -47,7 +47,7 @@ setup( dependency_links=[ "https://github.com/matrix-org/syutil/tarball/v0.0.2#egg=syutil-0.0.2", "https://github.com/pyca/pynacl/tarball/d4d3175589b892f6ea7c22f466e0e223853516fa#egg=pynacl-0.3.0", - "https://github.com/matrix-org/matrix-angular-sdk/tarball/v0.6.0/#egg=matrix_angular_sdk-0.6.0", + "https://github.com/matrix-org/matrix-angular-sdk/tarball/v0.6.1/#egg=matrix_angular_sdk-0.6.1", ], setup_requires=[ "Twisted==14.0.2", # Here to override setuptools_trial's dependency on Twisted>=2.4.0 diff --git a/synapse/__init__.py b/synapse/__init__.py index 895a0766d2..012425fa60 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.6.1b" +__version__ = "0.6.1d" |