diff options
| author | Erik Johnston <erik@matrix.org> | 2019-06-10 18:33:55 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-06-10 18:33:55 +0100 |
| commit | abce00fc6a722884d68aa56081b0e86a3c667b00 (patch) | |
| tree | 8a116e98cc94acb1e0393f0ecd8d63ca2c6893f7 /synapse/__init__.py | |
| parent | Merge pull request #5415 from matrix-org/erikj/fix_null_valid_until_ms (diff) | |
| parent | 1.0.0rc2 (diff) | |
| download | synapse-abce00fc6a722884d68aa56081b0e86a3c667b00.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 77a4cfc3a5..8dc07fe73c 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -27,4 +27,4 @@ try: except ImportError: pass -__version__ = "1.0.0rc1" +__version__ = "1.0.0rc2" |