summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-10-05 17:06:55 +0100
committerErik Johnston <erik@matrix.org>2016-10-05 17:06:55 +0100
commit503c0ab78b745e4b8789d2989b9ab9c336eff2b7 (patch)
tree670e728c9dea2662c04ccd5bfa0b7288065cad36
parentMerge pull request #1156 from matrix-org/dbkr/email_notifs_add_riot_brand (diff)
parentMerge branch 'release-v0.18.1' of github.com:matrix-org/synapse (diff)
downloadsynapse-503c0ab78b745e4b8789d2989b9ab9c336eff2b7.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
-rw-r--r--CHANGES.rst29
-rw-r--r--synapse/__init__.py2
2 files changed, 30 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 69640801d2..12abd6cfc4 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,32 @@
+Changes in synapse v0.18.1 (2016-10-0)
+======================================
+
+No changes since v0.18.1-rc1
+
+
+Changes in synapse v0.18.1-rc1 (2016-09-30)
+===========================================
+
+Features:
+
+* Add total_room_count_estimate to ``/publicRooms`` (PR #1133)
+
+
+Changes:
+
+* Time out typing over federation (PR #1140)
+* Restructure LDAP authentication (PR #1153)
+
+
+Bug fixes:
+
+* Fix 3pid invites when server is already in the room (PR #1136)
+* Fix upgrading with SQLite taking lots of CPU for a few days
+  after upgrade (PR #1144)
+* Fix upgrading from very old database versions (PR #1145)
+* Fix port script to work with recently added tables (PR #1146)
+
+
 Changes in synapse v0.18.0 (2016-09-19)
 =======================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 41745170a1..6dbe8fc7e7 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.18.0"
+__version__ = "0.18.1"