summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-06-13 12:26:42 +0100
committerErik Johnston <erik@matrix.org>2015-06-13 12:26:42 +0100
commitfe9bac37499ab5223054bc141457684bc1d55277 (patch)
tree46bc95b80f5eb71b85dc2d107a677a3124950d02 /synapse
parentMerge branch 'release-v0.9.2' (diff)
parentBump version (diff)
downloadsynapse-fe9bac37499ab5223054bc141457684bc1d55277.tar.xz
Merge pull request #184 from matrix-org/hotfixes-v0.9.2-r1 v0.9.2-r1
Hotfixes v0.9.2-r1
Diffstat (limited to 'synapse')
-rw-r--r--synapse/__init__.py2
-rw-r--r--synapse/storage/schema/delta/20/dummy.sql1
2 files changed, 2 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index e6088dc6cc..b6ac0dab32 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-r1"
diff --git a/synapse/storage/schema/delta/20/dummy.sql b/synapse/storage/schema/delta/20/dummy.sql
new file mode 100644
index 0000000000..e0ac49d1ec
--- /dev/null
+++ b/synapse/storage/schema/delta/20/dummy.sql
@@ -0,0 +1 @@
+SELECT 1;