diff options
author | Erik Johnston <erik@matrix.org> | 2015-09-16 11:05:34 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-09-16 11:05:34 +0100 |
commit | eb700cdc3886b5a31699fce25e9471c56b946b9d (patch) | |
tree | ca642b54b7e2c0cf1c85eb709b3052fc11ef7842 /synapse/__init__.py | |
parent | Merge pull request #281 from matrix-org/erikj/update_extremeties (diff) | |
parent | Merge branch 'hotfixes-v0.10.0-r2' of github.com:matrix-org/synapse (diff) | |
download | synapse-eb700cdc3886b5a31699fce25e9471c56b946b9d.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
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 5b5ff6c3f3..d62294e6bb 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.10.0-r1" +__version__ = "0.10.0-r2" |