summary refs log tree commit diff
path: root/AUTHORS.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-03-30 14:41:31 +0100
committerErik Johnston <erik@matrix.org>2016-03-30 14:41:31 +0100
commitd24662b88a59c872db4b5d96d2c5bec3c80294ca (patch)
tree28ec78dfcf1c8fe27c86709b5afea83d38a31556 /AUTHORS.rst
parentMerge pull request #671 from nikriek/jwt-support (diff)
parentMerge branch 'release-v0.14.0' of github.com:matrix-org/synapse (diff)
downloadsynapse-d24662b88a59c872db4b5d96d2c5bec3c80294ca.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'AUTHORS.rst')
-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