diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-28 15:35:39 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-28 15:35:39 +0100 |
| commit | 4d1ea4000856cd29778da2616fb8f602892905e0 (patch) | |
| tree | 68e4786675aa53586f31b27608f5acfe69a687af /synapse/__init__.py | |
| parent | Allow users to redact their own events (diff) | |
| parent | Merge branch 'release-v0.10.0' into develop (diff) | |
| download | synapse-4d1ea4000856cd29778da2616fb8f602892905e0.tar.xz | |
Merge branch 'develop' into redactyoself
Conflicts: synapse/handlers/_base.py
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 5853165a21..57b8304d35 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-rc1" +__version__ = "0.10.0-rc5" |