diff options
author | Hubert Chathi <hubert@uhoreg.ca> | 2019-08-01 16:31:40 -0400 |
---|---|---|
committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-08-01 16:31:40 -0400 |
commit | 336c546d6af5e85d830b6fe7cdc5445f92060b8a (patch) | |
tree | 58a4794f7bcabf8c72013365d185f8099666d630 /synapse/__init__.py | |
parent | Merge branch 'cross-signing_hidden' into cross-signing_keys (diff) | |
parent | don't need to return the hidden column any more (diff) | |
download | synapse-336c546d6af5e85d830b6fe7cdc5445f92060b8a.tar.xz |
Merge branch 'cross-signing_hidden' into cross-signing_keys
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 cf22fabd61..8301a13d8f 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -35,4 +35,4 @@ try: except ImportError: pass -__version__ = "1.1.0" +__version__ = "1.2.1" |