Skip to content
Snippets Groups Projects
Commit 1fe973fa authored by Erik Johnston's avatar Erik Johnston
Browse files

Merge branch 'master' of github.com:matrix-org/synapse into develop

parents b697a842 915e56e1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
CHANGES.rst
+ 6
− 0
View file @ 1fe973fa
Changes in synapse v0.11.0-r1 (2015-11-18)
==========================================
* Retry and fail federation requests more aggressively for requests that block
client side requests (PR #384)
Changes in synapse v0.11.0 (2015-11-17) Changes in synapse v0.11.0 (2015-11-17)
======================================= =======================================
......
README.rst
+ 2
− 0
View file @ 1fe973fa
...@@ -133,6 +133,8 @@ In case of problems, please see the _Troubleshooting section below. ...@@ -133,6 +133,8 @@ In case of problems, please see the _Troubleshooting section below.
Alternatively, Silvio Fricke has contributed a Dockerfile to automate the Alternatively, Silvio Fricke has contributed a Dockerfile to automate the
above in Docker at https://registry.hub.docker.com/u/silviof/docker-matrix/. above in Docker at https://registry.hub.docker.com/u/silviof/docker-matrix/.
Another alternative is to install via apt from http://matrix.org/packages/debian/.
To set up your homeserver, run (in your virtualenv, as before):: To set up your homeserver, run (in your virtualenv, as before)::
cd ~/.synapse cd ~/.synapse
......
synapse/__init__.py
+ 1
− 1
View file @ 1fe973fa
...@@ -16,4 +16,4 @@ ...@@ -16,4 +16,4 @@
""" This is a reference implementation of a Matrix home server. """ This is a reference implementation of a Matrix home server.
""" """
__version__ = "0.11.0" __version__ = "0.11.0-r1"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment