mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-09-19 11:44:38 -04:00
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/port_rest_events
This commit is contained in:
commit
307e313ef4
12 changed files with 95 additions and 61 deletions
|
@ -36,7 +36,7 @@ try:
|
|||
except ImportError:
|
||||
pass
|
||||
|
||||
__version__ = "1.5.0rc2"
|
||||
__version__ = "1.5.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