summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-03-29 23:19:52 +0100
committerErik Johnston <erik@matrix.org>2016-03-29 23:19:52 +0100
commita932acaa6b3063cb521a3bf26087b988d6d0d204 (patch)
tree4a5a3aabb45e21e567c5cb0b121c12c7191dada7
parentMerge branch 'release-v0.13.3' of github.com:matrix-org/synapse (diff)
parentAdd new author (diff)
downloadsynapse-a932acaa6b3063cb521a3bf26087b988d6d0d204.tar.xz
Merge pull request #672 from nikriek/new-author
Add new author
-rw-r--r--AUTHORS.rst7
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