diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-02-26 14:23:40 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-02-26 14:23:40 +0000 |
| commit | 802884d4ee06ca8e42f46f64e6da7c188d43dc69 (patch) | |
| tree | 6767e6e142d75e5500092a829d488583fcedef51 /AUTHORS.rst | |
| parent | Add changelog (diff) | |
| parent | Merge pull request #4745 from matrix-org/revert-4736-anoa/public_rooms_federate (diff) | |
| download | synapse-802884d4ee06ca8e42f46f64e6da7c188d43dc69.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_rooms_federate_develop
Diffstat (limited to 'AUTHORS.rst')
| -rw-r--r-- | AUTHORS.rst | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/AUTHORS.rst b/AUTHORS.rst index 9a83d90153..d599aec74c 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -65,4 +65,7 @@ Pierre Jaury <pierre at jaury.eu> * Docker packaging Serban Constantin <serban.constantin at gmail dot com> - * Small bug fix \ No newline at end of file + * Small bug fix + +Jason Robinson <jasonr at matrix.org> + * Minor fixes |