diff options
author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-11-19 16:53:13 +0000 |
---|---|---|
committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-11-19 16:53:13 +0000 |
commit | 1cfda3d2d8f0f63099c0176b4e01907aba7ad804 (patch) | |
tree | 7691812e7aa296267978d375d006ff8a1bf66aa1 /synapse/__init__.py | |
parent | Simplify code (diff) | |
parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
download | synapse-1cfda3d2d8f0f63099c0176b4e01907aba7ad804.tar.xz |
Merge branch 'develop' into daniel/forgetrooms
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 f0eac97bab..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" +__version__ = "0.11.0-r2" |