diff options
| author | Erik Johnston <erik@matrix.org> | 2019-02-25 15:08:18 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-02-25 15:08:18 +0000 |
| commit | 4b9e5076c40964a967a48a2c02623c81a43265aa (patch) | |
| tree | ae977487f07c0e64e406ada53655b3f69edb664e /demo | |
| parent | Docs and arg name clarification (diff) | |
| parent | Merge pull request #4723 from matrix-org/erikj/frontend_proxy_exception (diff) | |
| download | synapse-4b9e5076c40964a967a48a2c02623c81a43265aa.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_rooms_federate
Diffstat (limited to 'demo')
| -rw-r--r-- | demo/.gitignore | 7 | ||||
| -rw-r--r-- | demo/demo.tls.dh | 9 |
2 files changed, 7 insertions, 9 deletions
diff --git a/demo/.gitignore b/demo/.gitignore new file mode 100644 |