diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-08-12 17:07:22 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-08-12 17:21:14 +0100 |
| commit | 998a72d4d9ec6e73000888dcdf51437ec427fbee (patch) | |
| tree | f8fa9d5deb820b49eb3a216e194ee83e14fb9eda /AUTHORS.rst | |
| parent | Bump the version of twisted needed for setup_requires to 15.2.1 (diff) | |
| parent | Merge pull request #220 from matrix-org/markjh/generate_keys (diff) | |
| download | synapse-998a72d4d9ec6e73000888dcdf51437ec427fbee.tar.xz | |
Merge branch 'develop' into markjh/twisted-15
Conflicts: synapse/http/matrixfederationclient.py
Diffstat (limited to 'AUTHORS.rst')
| -rw-r--r-- | AUTHORS.rst | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/AUTHORS.rst b/AUTHORS.rst index 3a457cd9fc..54ced67000 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -38,3 +38,10 @@ Brabo <brabo at riseup.net> Ivan Shapovalov <intelfx100 at gmail.com> * contrib/systemd: a sample systemd unit file and a logger configuration + +Eric Myhre <hash at exultant.us> + * Fix bug where ``media_store_path`` config option was ignored by v0 content + repository API. + +Muthu Subramanian <muthu.subramanian.karunanidhi at ericsson.com> + * Add SAML2 support for registration and logins. |