diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2018-05-14 09:31:42 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2018-05-14 09:31:42 +0100 |
| commit | 977765bde2987770f63065d839f9686a7a144140 (patch) | |
| tree | 41d3a247f546cfe50500f465e50a798a597ef464 /AUTHORS.rst | |
| parent | remove user agent from data model, will just join on user_ips (diff) | |
| parent | Merge pull request #2846 from kaiyou/feat-dockerfile (diff) | |
| download | synapse-977765bde2987770f63065d839f9686a7a144140.tar.xz | |
Merge branch 'develop' of https://github.com/matrix-org/synapse into cohort_analytics
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 3dcb1c2a89..e13ac5ad34 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -60,3 +60,6 @@ Niklas Riekenbrauck <nikriek at gmail dot.com> Christoph Witzany <christoph at web.crofting.com> * Add LDAP support for authentication + +Pierre Jaury <pierre at jaury.eu> +* Docker packaging \ No newline at end of file |