summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2021-01-27 12:51:49 -0500
committerPatrick Cloke <patrickc@matrix.org>2021-01-27 12:51:49 -0500
commit00e97a7774a6c91fb3b528a207a1c2613ff38036 (patch)
tree251c4c5f7eba23bc5d41a3404e1d591405f60dae
parentCheck if a user is in the room before sending a PowerLevel event on their beh... (diff)
parentUpdate debian changelog. (diff)
downloadsynapse-00e97a7774a6c91fb3b528a207a1c2613ff38036.tar.xz
Merge branch 'master' into develop
-rw-r--r--debian/changelog8
1 files changed, 6 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 1c6308e3a2..57bab70a34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-matrix-synapse-py3 (1.25.0ubuntu1) UNRELEASED; urgency=medium
+matrix-synapse-py3 (1.26.0) stable; urgency=medium
 
+  [ Richard van der Hoff ]
   * Remove dependency on `python3-distutils`.
 
- -- Richard van der Hoff <richard@matrix.org>  Fri, 15 Jan 2021 12:44:19 +0000
+  [ Synapse Packaging team ]
+  * New synapse release 1.26.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 27 Jan 2021 12:43:35 -0500
 
 matrix-synapse-py3 (1.25.0) stable; urgency=medium