diff options
| author | Erik Johnston <erik@matrix.org> | 2019-03-06 19:30:30 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-03-06 19:30:30 +0000 |
| commit | 8f7dbbc14a1e8c7c7bc42afa17bc2f4d88ad3d10 (patch) | |
| tree | 7f20429e4b25eda5c8dded42a1f0b6ff574b636a /AUTHORS.rst | |
| parent | Reenable presence tests and remove pointless change (diff) | |
| parent | Merge pull request #4818 from matrix-org/erikj/prefill_client_ips (diff) | |
| download | synapse-8f7dbbc14a1e8c7c7bc42afa17bc2f4d88ad3d10.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
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 |