diff options
| author | Patrick Cloke <patrickc@matrix.org> | 2020-04-23 12:04:50 -0400 |
|---|---|---|
| committer | Patrick Cloke <patrickc@matrix.org> | 2020-04-23 12:04:50 -0400 |
| commit | 68384d96fd22a874b62caa21d51418d447259b0d (patch) | |
| tree | 0aa751070f6d62b92fd607f67c59b13c61d0039a /synapse | |
| parent | Revert "Revert "Merge pull request #7315 from matrix-org/babolivier/request_t... (diff) | |
| parent | Merge tag 'v1.12.4' (diff) | |
| download | synapse-68384d96fd22a874b62caa21d51418d447259b0d.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
| -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 fff9d311f3..d8d340f426 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.12.4rc1" +__version__ = "1.12.4" 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 |