diff options
author | Erik Johnston <erik@matrix.org> | 2019-01-25 14:11:17 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-01-25 14:11:17 +0000 |
commit | 431e485914b01eb1b245e37df814ff5bac110be1 (patch) | |
tree | 1262900b08616aa08768d9883349b11725218528 /demo/webserver.py | |
parent | Newsfile (diff) | |
parent | Fix quoting for allowed_local_3pids example config (#4476) (diff) | |
download | synapse-431e485914b01eb1b245e37df814ff5bac110be1.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sqlite_native_upsert
Diffstat (limited to 'demo/webserver.py')
0 files changed, 0 insertions, 0 deletions