diff options
author | Eric Eastwood <erice@element.io> | 2021-12-09 02:53:17 -0600 |
---|---|---|
committer | Eric Eastwood <erice@element.io> | 2021-12-09 02:53:17 -0600 |
commit | 6b64184585b4935c75e6f4ed44ac17ca48e1f71f (patch) | |
tree | 048c8b90df46d609514b8bba2c6df5bb809225d2 /synapse/__init__.py | |
parent | Merge branch 'develop' into madlittlemods/return-historical-events-in-order-f... (diff) | |
parent | Add a constant for receipt types (m.read). (#11531) (diff) | |
download | synapse-6b64184585b4935c75e6f4ed44ac17ca48e1f71f.tar.xz |
Merge branch 'develop' into madlittlemods/return-historical-events-in-order-from-backfill
Conflicts: scripts-dev/complement.sh synapse/handlers/room_batch.py
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 5ef34bce40..6369f18a53 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.46.0" +__version__ = "1.49.0rc1" if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)): # We import here so that we don't have to install a bunch of deps when |