summary refs log tree commit diff
diff options
context:
space:
mode:
authorMathieu Velten <mathieuv@matrix.org>2023-05-09 19:42:57 +0200
committerMathieu Velten <mathieuv@matrix.org>2023-05-09 19:42:57 +0200
commit266d287165c9b7799c7cedc75606739b713cd9d6 (patch)
tree6a379292942a8c5af5668beed76b4b058481159f
parentError if attempting to set m.push_rules account data, per MSC4010. (#15555) (diff)
parent1.83.0 (diff)
downloadsynapse-266d287165c9b7799c7cedc75606739b713cd9d6.tar.xz
Merge branch 'master' into develop
-rw-r--r--CHANGES.md6
-rw-r--r--debian/changelog6
-rw-r--r--pyproject.toml2
3 files changed, 13 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md
index f055772ca0..9c200bfb7b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,9 @@
+Synapse 1.83.0 (2023-05-09)
+===========================
+
+No significant changes since 1.83.0rc1.
+
+
 Synapse 1.83.0rc1 (2023-05-02)
 ==============================
 
diff --git a/debian/changelog b/debian/changelog
index a50fda69a8..15ff7e82c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.83.0) stable; urgency=medium
+
+  * New Synapse release 1.83.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 09 May 2023 18:13:37 +0200
+
 matrix-synapse-py3 (1.83.0~rc1) stable; urgency=medium
 
   * New Synapse release 1.83.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index a571cfbebd..684f65b4a0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -89,7 +89,7 @@ manifest-path = "rust/Cargo.toml"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.83.0rc1"
+version = "1.83.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"