3 years ago · 66abd5b680
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
 
				+Sydent 2.2.0 (2020-09-11)
			
 
				+=========================
			
 
				+
			
 
				+Bugfixes
			
 
				+--------
			
 
				+
			
 
				+- Fix intermittent deadlock in Sentry integration. ([\#312](https://github.com/matrix-org/sydent/issues/312))
			
 
				+
			
 
				+
			
 
				 Sydent 2.1.0 (2020-09-10)
			
 
				 =========================
			
 
				 
			
--- a/changelog.d/312.bugfix
+++ b/changelog.d/312.bugfix
@@ -1 +0,0 @@
 
				-Fix intermittent deadlock in Sentry integration.
			
--- a/sydent/__init__.py
+++ b/sydent/__init__.py
@@ -1 +1 @@
 
				-__version__ = '2.1.0'
			
 
				+__version__ = '2.2.0'
		`@@ -1 +0,0 @@`
		`-Fix intermittent deadlock in Sentry integration.`