diff options
author | Erik Johnston <erik@matrix.org> | 2016-04-07 17:35:28 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-04-07 17:35:28 +0100 |
commit | f942980c0b5ee18ab49a27870aedb4b8302efe4c (patch) | |
tree | 46e0999fa3099fd46e88eb930d00065ddf71515f /AUTHORS.rst | |
parent | Merge pull request #706 from matrix-org/markjh/slaveIV (diff) | |
parent | Add myself to AUTHORS.rst (diff) | |
download | synapse-f942980c0b5ee18ab49a27870aedb4b8302efe4c.tar.xz |
Merge pull request #701 from DoubleMalt/ldap-auth
Add LDAP authentication
Diffstat (limited to 'AUTHORS.rst')
-rw-r--r-- | AUTHORS.rst | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/AUTHORS.rst b/AUTHORS.rst index 8711a6ae5c..3dcb1c2a89 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -57,3 +57,6 @@ Florent Violleau <floviolleau at gmail dot com> Niklas Riekenbrauck <nikriek at gmail dot.com> * Add JWT support for registration and login + +Christoph Witzany <christoph at web.crofting.com> + * Add LDAP support for authentication |