diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-10-13 10:33:00 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-10-13 10:33:00 +0100 |
| commit | f96b48067065b12654f60a7d8849eebeb5338a73 (patch) | |
| tree | 1b9edd18e4e8c4f2218756b501292fde1fcb252e /AUTHORS.rst | |
| parent | Start spliting out the rooms into joined and invited in v2 sync (diff) | |
| parent | Merge pull request #299 from stevenhammerton/sh-cas-required-attribute (diff) | |
| download | synapse-f96b48067065b12654f60a7d8849eebeb5338a73.tar.xz | |
Merge branch 'develop' into markjh/v2_sync_api
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. |