diff options
author | Hubert Chathi <hubert@uhoreg.ca> | 2019-08-28 17:33:44 -0700 |
---|---|---|
committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-08-28 17:33:44 -0700 |
commit | 72d296a7f3b931e426b53f7725ab05b09dc1ea4b (patch) | |
tree | cef44e834e13da97f12f25dbcda8c25cd4df6258 /synapse/__init__.py | |
parent | Cross-signing [1/4] -- hidden devices (#5759) (diff) | |
parent | Add a link to python's logging config schema (#5926) (diff) | |
download | synapse-72d296a7f3b931e426b53f7725ab05b09dc1ea4b.tar.xz |
Merge branch 'develop' into uhoreg/e2e_cross-signing_merged
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 8301a13d8f..6766ef445c 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -35,4 +35,4 @@ try: except ImportError: pass -__version__ = "1.2.1" +__version__ = "1.3.1" |