summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-01-29 13:56:22 +0000
committerErik Johnston <erik@matrix.org>2016-01-29 13:56:22 +0000
commit96bb4bf38ab9fe204c956b3d3e88ccb19acc1728 (patch)
tree6a05ee02c7f4543d5d96d56e9f5f6452bb9879c7
parentMerge branch 'develop' of github.com:matrix-org/synapse into release-v0.12.1 (diff)
downloadsynapse-96bb4bf38ab9fe204c956b3d3e88ccb19acc1728.tar.xz
Update CHANGES v0.12.1-rc1
-rw-r--r--CHANGES.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index dd4863c3e6..b9c956fd03 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,4 +1,4 @@
-Changes in synapse v0.12.1-rc1 (2016-01-xx)
+Changes in synapse v0.12.1-rc1 (2016-01-29)
 ===========================================
 
 Features:
@@ -18,8 +18,8 @@ Changes:
 * Change to require unbanning before other membership changes (PR #501)
 * Change default push rules to notify for all messages (PR #486)
 * Change default push rules to not notify on membership changes (PR #514)
-* Change default push rules to only notify messages in one to one rooms
-  (PR #529)
+* Change default push rules in one to one rooms to only notify for events that
+  are messages (PR #529)
 * Change ``/sync`` to reject requests with a ``from`` query param (PR #512)
 * Change server manhole to use SSH rather than telnet (PR #473)
 * Change server to require AS users to be registered before use (PR #487)
@@ -39,7 +39,7 @@ Bug fixes:
 * Fix bug where ``/events`` would always return immediately for guest users
   (PR #480)
 * Fix bug where ``/sync`` unexpectedly returned old left rooms (PR #481)
-* Fix enabling and disabling push rules (P #498)
+* Fix enabling and disabling push rules (PR #498)
 * Fix bug where ``/register`` returned 500 when given unicode username
   (PR #513)