diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-10-13 13:32:43 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-10-13 13:32:43 +0100 |
| commit | 32a453d7ba43f4bbf7160761858367072fe8c43f (patch) | |
| tree | 3fb96db58bc18f76b2f22bee85824d7024435791 /AUTHORS.rst | |
| parent | Merge branch 'develop' into daniel/3pidinvites (diff) | |
| parent | Merge pull request #299 from stevenhammerton/sh-cas-required-attribute (diff) | |
| download | synapse-32a453d7ba43f4bbf7160761858367072fe8c43f.tar.xz | |
Merge branch 'develop' into daniel/3pidinvites
Diffstat (limited to 'AUTHORS.rst')
| -rw-r--r-- | AUTHORS.rst | 5 |
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. |