From 07fa64d73d2fe83ac9571d842e7fa0d10a307d74 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 9 Aug 2016 16:46:49 +0100
Subject: [PATCH] Update changelog

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

diff --git a/changelogs/client_server.rst b/changelogs/client_server.rst
index 8d903cd0c..40d5d764b 100644
--- a/changelogs/client_server.rst
+++ b/changelogs/client_server.rst
@@ -14,6 +14,8 @@
 
   - Add ``filename`` parameter to ``POST /_matrix/media/r0/upload``
     (`#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>`_).
 
 
 r0.2.0