diff options
author | Erik Johnston <erik@matrix.org> | 2019-06-11 10:37:43 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-06-11 10:37:43 +0100 |
commit | 5bc94845378aa0e8dea9bc325ac2c57aaa540ce6 (patch) | |
tree | 6bf0bb46d390ca3185fe8491ff0470d3223ab6ba /synapse/__init__.py | |
parent | Don't warn user about password reset disabling through config code (#5387) (diff) | |
parent | 1.0.0rc3 (diff) | |
download | synapse-5bc94845378aa0e8dea9bc325ac2c57aaa540ce6.tar.xz |
Merge branch 'release-v1.0.0' 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 8dc07fe73c..9c75a0a27f 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -27,4 +27,4 @@ try: except ImportError: pass -__version__ = "1.0.0rc2" +__version__ = "1.0.0rc3" |