diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2016-04-04 00:38:21 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2016-04-04 00:38:21 +0100 |
| commit | 9f7dc2bef7cd39645ae74d96f2919a3f9fdb65ac (patch) | |
| tree | b818eb0b962de7e860584bb5286f98e60e12ac75 /AUTHORS.rst | |
| parent | report image size (bytewise) in OG meta (diff) | |
| parent | Merge pull request #686 from matrix-org/markjh/doc_strings (diff) | |
| download | synapse-9f7dc2bef7cd39645ae74d96f2919a3f9fdb65ac.tar.xz | |
Merge branch 'develop' into matthew/preview_urls
Diffstat (limited to 'AUTHORS.rst')
| -rw-r--r-- | AUTHORS.rst | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/AUTHORS.rst b/AUTHORS.rst index 07d4bee2a3..8711a6ae5c 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -29,7 +29,7 @@ Matthew Hodgson <matthew at matrix.org> Emmanuel Rohee <manu at matrix.org> * Supporting iOS clients (testability and fallback registration) - + Turned to Dust <dwinslow86 at gmail.com> * ArchLinux installation instructions @@ -53,4 +53,7 @@ Mads Robin Christensen <mads at v42 dot dk> * CentOS 7 installation instructions. Florent Violleau <floviolleau at gmail dot com> - * Add Raspberry Pi installation instructions and general troubleshooting items \ No newline at end of file + * Add Raspberry Pi installation instructions and general troubleshooting items + +Niklas Riekenbrauck <nikriek at gmail dot.com> + * Add JWT support for registration and login |