summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-03-19 17:51:37 +0000
committerErik Johnston <erik@matrix.org>2015-03-19 17:51:37 +0000
commit532ebc4a823a17ce6b76e0e38dee0bd5f0454913 (patch)
tree9e07833ff1a8ae937942c92388cdbfef2042138f
parentMerge branch 'hotfixes-0.8.1a' of github.com:matrix-org/synapse (diff)
parentBump version (diff)
downloadsynapse-532ebc4a823a17ce6b76e0e38dee0bd5f0454913.tar.xz
Merge pull request #112 from matrix-org/hotfixes-v0.8.1-r2 v0.8.1-r2
Hotfixes v0.8.1 r2
-rw-r--r--synapse/__init__.py2
-rw-r--r--synapse/federation/transport/server.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index ca53f2db8d..749a60329c 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-r1"
+__version__ = "0.8.1-r2"
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py
index 7838a81362..2bfe0f3c9b 100644
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@@ -361,4 +361,5 @@ SERVLET_CLASSES = (
     FederationInviteServlet,
     FederationQueryAuthServlet,
     FederationGetMissingEventsServlet,
+    FederationEventAuthServlet,
 )