diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-07-25 15:19:22 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-07-25 15:19:22 +0100 |
| commit | f16aa3a44ba4198af05b5419c77e37eb85c94b64 (patch) | |
| tree | 9032b35f9279951971a6163155cda4e0afde4803 /synapse | |
| parent | Merge tag 'v1.2.0rc2' into develop (diff) | |
| parent | 1.2.0 (diff) | |
| download | synapse-f16aa3a44ba4198af05b5419c77e37eb85c94b64.tar.xz | |
Merge branch 'master' 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 ca14545e4d..3435de4e2f 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -35,4 +35,4 @@ try: except ImportError: pass -__version__ = "1.2.0rc2" +__version__ = "1.2.0" |