summary refs log tree commit diff
diff options
context:
space:
mode:
authorOlivier Wilkinson (reivilibre) <oliverw@matrix.org>2024-01-31 12:03:29 +0000
committerOlivier Wilkinson (reivilibre) <oliverw@matrix.org>2024-01-31 12:03:29 +0000
commit3ba984d7af6a191227c6f5f39d22ef4725bc82b6 (patch)
treed39b682240421ca3c835337c2f98d600bc1950f5
parentBump gitpython from 3.1.40 to 3.1.41 (#16850) (diff)
parent1.100.0 (diff)
downloadsynapse-3ba984d7af6a191227c6f5f39d22ef4725bc82b6.tar.xz
Merge branch 'master' into develop
-rw-r--r--CHANGES.md7
-rw-r--r--debian/changelog6
-rw-r--r--pyproject.toml2
3 files changed, 14 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md
index d14e91e221..10361b73e4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,10 @@
+# Synapse 1.100.0 (2024-01-30)
+
+No significant changes since 1.100.0rc3.
+
+
+
+
 # Synapse 1.100.0rc3 (2024-01-24)
 
 ### Bugfixes
diff --git a/debian/changelog b/debian/changelog
index 67212704bb..d5262653ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.100.0) stable; urgency=medium
+
+  * New Synapse release 1.100.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 30 Jan 2024 16:58:19 +0000
+
 matrix-synapse-py3 (1.100.0~rc3) stable; urgency=medium
 
   * New Synapse release 1.100.0rc3.
diff --git a/pyproject.toml b/pyproject.toml
index 99c29cea2d..a3c5c242ed 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -96,7 +96,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.100.0rc3"
+version = "1.100.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"