diff options
| author | Erik Johnston <erik@matrix.org> | 2017-01-09 14:51:17 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-01-09 14:51:17 +0000 |
| commit | 9898bbd9dc60653cd0186460c0014505195ed874 (patch) | |
| tree | af4ffd4da02bc3c917537b4882010d776f9c6b5d /synapse | |
| parent | gah, fix mangled merge of 0.18.7 into develop (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-9898bbd9dc60653cd0186460c0014505195ed874.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
| -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 cb332279df..498ded38c0 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.18.7-rc2" +__version__ = "0.18.7" |