diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-11-20 10:00:13 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-11-20 10:00:13 +0000 |
| commit | b2aeaa2dcc833430330b556453acb83b23a95650 (patch) | |
| tree | 81807cc40eded2faae7bfb7f969ada5b31798642 /synapse | |
| parent | SYN-153: Fix formatting of federation error message (diff) | |
| parent | typoe (diff) | |
| download | synapse-b2aeaa2dcc833430330b556453acb83b23a95650.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/storage/__init__.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 23ae5f003f..14564e735e 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a synapse home server. """ -__version__ = "0.4.2" +__version__ = "0.5.0" diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index c36d938d96..330d3b793f 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -67,7 +67,7 @@ SCHEMAS = [ # Remember to update this number every time an incompatible change is made to # database schema files, so the users will be informed on server restarts. -SCHEMA_VERSION = 6 +SCHEMA_VERSION = 7 class _RollbackButIsFineException(Exception): |