diff options
author | Erik Johnston <erik@matrix.org> | 2016-07-29 11:24:56 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-07-29 11:24:56 +0100 |
commit | 5aa024e50132924d50229c633249a17eff9180f1 (patch) | |
tree | 5b0ee152c49f6a772bcb4e133fd4649aa612bda3 /synapse/__init__.py | |
parent | Add destination retry to slave store (diff) | |
parent | Merge pull request #966 from matrix-org/markjh/fix_push (diff) | |
download | synapse-5aa024e50132924d50229c633249a17eff9180f1.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader
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 2750ad3f7a..8f0176e182 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.16.1-r1" +__version__ = "0.17.0-rc1" |