diff options
| author | Erik Johnston <erik@matrix.org> | 2014-11-27 17:30:31 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-11-27 17:30:31 +0000 |
| commit | c4bdeb5f0e83a46b3691628eae2ba2ef296bdb15 (patch) | |
| tree | 95a6f38fb1d7d588dcb9b37bee63de8daeb163e3 | |
| parent | Merge branch 'release-v0.5.3' of github.com:matrix-org/synapse into develop (diff) | |
| parent | Bump version (diff) | |
| download | synapse-c4bdeb5f0e83a46b3691628eae2ba2ef296bdb15.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
| -rw-r--r-- | VERSION | 2 | ||||
| -rwxr-xr-x | setup.py | 2 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/VERSION b/VERSION index be14282b7f..dc74c5626d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.5.3 +0.5.3a diff --git a/setup.py b/setup.py index 6b4320f0c9..9b38f790b9 100755 --- a/setup.py +++ b/setup.py @@ -44,7 +44,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/52dbe2dc33f1#egg=pynacl-0.3.0", + "https://github.com/pyca/pynacl/tarball/d4d3175589b892f6ea7c22f466e0e223853516fa#egg=pynacl-0.3.0", "https://github.com/matrix-org/matrix-angular-sdk/tarball/v0.5.1/#egg=matrix_angular_sdk-0.5.1", ], setup_requires=[ diff --git a/synapse/__init__.py b/synapse/__init__.py index c99cd96537..658574dab9 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a synapse home server. """ -__version__ = "0.5.3" +__version__ = "0.5.3a" |