diff options
author | Erik Johnston <erik@matrix.org> | 2015-06-15 15:17:47 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-06-15 15:17:47 +0100 |
commit | f0583f65e18925cda99a7d761cfaf3ce9a3ac2f9 (patch) | |
tree | d3f16593aea2d6871365cc24bcc09fd048885920 /synapse | |
parent | Merge pull request #183 from intelfx/install-python-schema-deltas (diff) | |
parent | Merge pull request #186 from matrix-org/hotfixes-v0.9.2-r2 (diff) | |
download | synapse-f0583f65e18925cda99a7d761cfaf3ce9a3ac2f9.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
-rw-r--r-- | synapse/__init__.py | 2 | ||||
-rw-r--r-- | synapse/storage/schema/delta/20/dummy.sql | 1 |
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; |