Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45 from matrix-org/hotfixes-v0.6.1d 

Hotfixes v0.6.1d
This commit is contained in:
Mark Haines 2015-02-02 13:21:03 +00:00
parent c3979b236e d8cf06e525
commit 898835d924
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
0.6.1c 0.6.1d

3
setup.py
View File

@ -33,7 +33,7 @@ setup(
install_requires=[ install_requires=[
"syutil==0.0.2", "syutil==0.0.2",
"matrix_angular_sdk>=0.6.1", "matrix_angular_sdk>=0.6.1",
"Twisted>=14.0.0", "Twisted==14.0.2",
"service_identity>=1.0.0", "service_identity>=1.0.0",
"pyopenssl>=0.14", "pyopenssl>=0.14",
"pyyaml", "pyyaml",
@ -50,6 +50,7 @@ setup(
"https://github.com/matrix-org/matrix-angular-sdk/tarball/v0.6.1/#egg=matrix_angular_sdk-0.6.1", "https://github.com/matrix-org/matrix-angular-sdk/tarball/v0.6.1/#egg=matrix_angular_sdk-0.6.1",
], ],
setup_requires=[ setup_requires=[
"Twisted==14.0.2",
"setuptools_trial", "setuptools_trial",
"setuptools>=1.0.0", # Needs setuptools that supports git+ssh. "setuptools>=1.0.0", # Needs setuptools that supports git+ssh.
# TODO: Do we need this now? we don't use git+ssh. # TODO: Do we need this now? we don't use git+ssh.

2
synapse/__init__.py
View File

@ -16,4 +16,4 @@
""" This is a reference implementation of a synapse home server. """ This is a reference implementation of a synapse home server.
""" """
__version__ = "0.6.1c" __version__ = "0.6.1d"