summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2015-02-23 17:16:03 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2015-02-23 17:16:03 +0000
commitbd84755e64a5fd086738a43e049885604ea53927 (patch)
tree39b3bf10a5b074c82e48a723670a539b9149a8ee /synapse/__init__.py
parentPull the _get_event_cache.setdefault() call out of the try block, as it doesn... (diff)
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-bd84755e64a5fd086738a43e049885604ea53927.tar.xz
Merge remote-tracking branch 'origin/develop' into performance-cache-improvements
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 a804a25748..f8ec4b0459 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.7.1"
+__version__ = "0.7.1-r1"