diff options
author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-11-19 17:21:03 +0000 |
---|---|---|
committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-11-19 17:21:03 +0000 |
commit | dd11bf8a795ed9c20ce694cd0cd12cf47c00fd25 (patch) | |
tree | f1647aaf46015d8da38d7ed1c6192cc835f13192 /synapse/__init__.py | |
parent | Put back the 'state.events' subobject (diff) | |
parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
download | synapse-dd11bf8a795ed9c20ce694cd0cd12cf47c00fd25.tar.xz |
Merge branch 'develop' into rav/flatten_sync_response
Diffstat (limited to 'synapse/__init__.py')
-rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 5a83f5f3ec..7ff37edf2c 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.11.0-r1" +__version__ = "0.11.0-r2" |