From 6a4f65d78f7affec5b97a98ff89c88576931bbef Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Mon, 15 Aug 2016 13:50:58 +0100
Subject: [PATCH] update c-s changelog

---
 changelogs/client_server.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/changelogs/client_server.rst b/changelogs/client_server.rst
index 40d5d764b..ba0a4ecf3 100644
--- a/changelogs/client_server.rst
+++ b/changelogs/client_server.rst
@@ -9,6 +9,8 @@
     (`#363 <https://github.com/matrix-org/matrix-doc/pull/363>`_).
   - Clarify the fields which are applicable to different types of push rule
     (`#365 <https://github.com/matrix-org/matrix-doc/pull/365>`_).
+  - A number of clarifications to authentication
+    (`#371 <https://github.com/matrix-org/matrix-doc/pull/371>`_).
 
 - Changes to the API which will be backwards-compatible for clients:
 
@@ -16,6 +18,8 @@
     (`#364 <https://github.com/matrix-org/matrix-doc/pull/364>`_).
   - Document CAS-based client login and the use of ``m.login.token`` in
     ``/login`` (`#367 <https://github.com/matrix-org/matrix-doc/pull/367>`_).
+  - Make ``origin_server_ts`` a mandatory field of room events
+    (`#379 <https://github.com/matrix-org/matrix-doc/pull/370>`_).
 
 
 r0.2.0