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

2 files changed, 2 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"
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;