Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
erikjohnston committed Apr 2, 2024
2 parents ec174d0 + ca27b51 commit 5177674
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 2 deletions.
7 changes: 7 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# Synapse 1.104.0 (2024-04-02)

### Bugfixes

- Fix regression when using OIDC provider. Introduced in v1.104.0rc1. ([\#17031](https://github.com/element-hq/synapse/issues/17031))


# Synapse 1.104.0rc1 (2024-03-26)

### Features
Expand Down
1 change: 0 additions & 1 deletion changelog.d/17031.feature

This file was deleted.

6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
matrix-synapse-py3 (1.104.0) stable; urgency=medium

* New Synapse release 1.104.0.

-- Synapse Packaging team <packages@matrix.org> Tue, 02 Apr 2024 17:15:45 +0100

matrix-synapse-py3 (1.104.0~rc1) stable; urgency=medium

* New Synapse release 1.104.0rc1.
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ module-name = "synapse.synapse_rust"

[tool.poetry]
name = "matrix-synapse"
version = "1.104.0rc1"
version = "1.104.0"
description = "Homeserver for the Matrix decentralised comms protocol"
authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
license = "AGPL-3.0-or-later"
Expand Down

0 comments on commit 5177674

Please sign in to comment.