mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2025-09-16 09:04:35 -04:00
Merge branch 'master' into develop
This commit is contained in:
commit
3aa36b782c
17 changed files with 463 additions and 236 deletions
|
@ -48,7 +48,7 @@ try:
|
|||
except ImportError:
|
||||
pass
|
||||
|
||||
__version__ = "1.18.0rc2"
|
||||
__version__ = "1.18.0"
|
||||
|
||||
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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue