diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-07-26 12:39:33 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-07-26 12:39:33 +0100 |
| commit | d74595e2ca2fcf23c04d28e11d4fe1de74ed4f4a (patch) | |
| tree | a00671f417602e46b5e6d9c31bcd2f92b4095673 /synapse/__init__.py | |
| parent | Merge pull request #5744 from matrix-org/erikj/log_leave_origin_mismatch (diff) | |
| parent | yet more changelog attribution fixes (diff) | |
| download | synapse-d74595e2ca2fcf23c04d28e11d4fe1de74ed4f4a.tar.xz | |
Merge branch 'master' 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 3435de4e2f..8301a13d8f 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -35,4 +35,4 @@ try: except ImportError: pass -__version__ = "1.2.0" +__version__ = "1.2.1" |