diff options
| author | Jeroen <vo.jeroen@gmail.com> | 2018-07-09 08:51:11 +0200 |
|---|---|---|
| committer | Jeroen <vo.jeroen@gmail.com> | 2018-07-09 08:51:11 +0200 |
| commit | b5e157d895dcf182d7ffc58edf6442deeaebc3f0 (patch) | |
| tree | a3f8a4549d0fe4947bef34632218b41c94202b19 /changelog.d/.gitignore | |
| parent | take idna implementation from twisted (diff) | |
| parent | Add an isort configuration (#3463) (diff) | |
| download | synapse-b5e157d895dcf182d7ffc58edf6442deeaebc3f0.tar.xz | |
Merge branch 'develop' into send_sni_for_federation_requests
# Conflicts: # synapse/http/endpoint.py
Diffstat (limited to 'changelog.d/.gitignore')
| -rw-r--r-- | changelog.d/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/.gitignore b/changelog.d/.gitignore new file mode 100644 index 0000000000..f935021a8f --- /dev/null +++ b/changelog.d/.gitignore @@ -0,0 +1 @@ +!.gitignore |