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 | |
| 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
| -rw-r--r-- | CHANGES.md | 7 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md index 32c19e8bfa..adb2b3e163 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,13 @@ Next version should update to using the async/await version `complete_sso_login_async` which includes additional checks. The non-async version is considered deprecated. + +Synapse 1.12.4 (2020-04-23) +=========================== + +No significant changes. + + Synapse 1.12.4rc1 (2020-04-22) ============================== diff --git a/debian/changelog b/debian/changelog index 412e850325..8641571986 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,16 @@ +<<<<<<< HEAD matrix-synapse-py3 (1.12.3ubuntu1) UNRELEASED; urgency=medium * Add information about .well-known files to Debian installation scripts. -- Patrick Cloke <patrickc@matrix.org> Mon, 06 Apr 2020 10:10:38 -0400 +======= +matrix-synapse-py3 (1.12.4) stable; urgency=medium + + * New synapse release 1.12.4. + + -- Synapse Packaging team <packages@matrix.org> Thu, 23 Apr 2020 10:58:14 -0400 +>>>>>>> master matrix-synapse-py3 (1.12.3) stable; urgency=medium 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 |