summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-06-15 18:26:24 +0100
committerErik Johnston <erik@matrix.org>2015-06-15 18:26:24 +0100
commitf13890ddcec3c581cb7a9c5fd07b856134fbf5f6 (patch)
tree9af75062a32c58bd986ec9306d9ff570cb92e84f /synapse/__init__.py
parentDisable twisted access logging. Move access logging to SynapseRequest object (diff)
parentMerge pull request #185 from matrix-org/erikj/listeners_config (diff)
downloadsynapse-f13890ddcec3c581cb7a9c5fd07b856134fbf5f6.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sanitize_logging
Diffstat (limited to 'synapse/__init__.py')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index e6088dc6cc..d111335a1a 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.9.2"
+__version__ = "0.9.2-r2"