From afb7f173cf3f04ffe212025910a950814d1761bc Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 12 Sep 2014 18:13:05 +0100
Subject: [PATCH] Bump version and change log

---
 CHANGES.rst         | 19 +++++++++++++++++++
 VERSION             |  2 +-
 synapse/__init__.py |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index b9b3e9d0e..ec53438f5 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,22 @@
+Changes in synapse 0.2.3 (2014-09-12)
+=====================================
+
+Homeserver:
+ * Fix bug where we stopped sending events to remote home servers if a
+   user from that home server left, even if there were some still in the
+   room.
+ * Fix bugs in the state conflict resolution where it was incorrectly
+   rejecting events.
+
+Webclient:
+ * Display room names and topics.
+ * Allow setting/editing of room names and topics.
+ * Display information about rooms on the main page.
+ * Handle ban and kick events in real time.
+ * VoIP UI and reliabilty improvements.
+ * Improvements to initial startup speed.
+ * Don't display duplicate join events.
+
 Changes in synapse 0.2.2 (2014-09-06)
 =====================================
 
diff --git a/VERSION b/VERSION
index ee1372d33..717903969 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.2
+0.2.3
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 1ed9cdcdf..d60267ebe 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a synapse home server.
 """
 
-__version__ = "0.2.2"
+__version__ = "0.2.3"