diff options
author | Erik Johnston <erik@matrix.org> | 2018-01-12 11:28:49 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-01-12 11:28:49 +0000 |
commit | 81391fa162d6f04771b535ace95e53e2d1b45777 (patch) | |
tree | 7ad6e0ff6be63bed9cf9d69408378ba69e04e1cc /synapse/__init__.py | |
parent | Remove unnecessary condition (diff) | |
parent | Merge pull request #2766 from matrix-org/rav/room_event (diff) | |
download | synapse-81391fa162d6f04771b535ace95e53e2d1b45777.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/media_storage_refactor
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 8c3d7a210a..ef8853bd24 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.25.1" +__version__ = "0.26.0" |