summary refs log tree commit diff
path: root/AUTHORS.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-12 15:06:18 +0100
committerErik Johnston <erik@matrix.org>2015-10-12 15:06:18 +0100
commitf6fde343a10890e2e8a509e82babb34dd0fbaf06 (patch)
treeeab85df2d409119042a731667bd1cec1bc70028f /AUTHORS.rst
parentRemove unused room_id parameter (diff)
parentMerge pull request #296 from matrix-org/markjh/eventstream_presence (diff)
downloadsynapse-f6fde343a10890e2e8a509e82babb34dd0fbaf06.tar.xz
Merge remote-tracking branch 'origin/develop' into erikj/search
Diffstat (limited to 'AUTHORS.rst')
-rw-r--r--AUTHORS.rst5
1 files changed, 4 insertions, 1 deletions
diff --git a/AUTHORS.rst b/AUTHORS.rst
index 54ced67000..58a67c6b12 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -44,4 +44,7 @@ Eric Myhre <hash at exultant.us>
    repository API.
 
 Muthu Subramanian <muthu.subramanian.karunanidhi at ericsson.com>
- * Add SAML2 support for registration and logins.
+ * Add SAML2 support for registration and login.
+
+Steven Hammerton <steven.hammerton at openmarket.com>
+ * Add CAS support for registration and login.