From 92faeb2a3fc73bd9307b3192aeacec4afb1aad1a Mon Sep 17 00:00:00 2001
From: Amber Brown <hawkowl@atleastfornow.net>
Date: Thu, 4 Oct 2018 22:38:10 +1000
Subject: [PATCH] changelog

---
 CHANGES.md            | 9 +++++++++
 changelog.d/4002.misc | 1 -
 2 files changed, 9 insertions(+), 1 deletion(-)
 delete mode 100644 changelog.d/4002.misc

diff --git a/CHANGES.md b/CHANGES.md
index 03d7412874..048b9f95db 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 0.33.6 (2018-10-04)
+===========================
+
+Internal Changes
+----------------
+
+- Pin to prometheus_client<0.4 to avoid renaming all of our metrics ([\#4002](https://github.com/matrix-org/synapse/issues/4002))
+
+
 Synapse 0.33.6rc1 (2018-10-03)
 ==============================
 
diff --git a/changelog.d/4002.misc b/changelog.d/4002.misc
deleted file mode 100644
index 545abe5d58..0000000000
--- a/changelog.d/4002.misc
+++ /dev/null
@@ -1 +0,0 @@
-Pin to prometheus_client<0.4 to avoid renaming all of our metrics
\ No newline at end of file