diff options
author | Erik Johnston <erik@matrix.org> | 2019-09-06 12:50:28 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-09-06 12:50:28 +0100 |
commit | 39883e85bd2ada6fcf2b56be5bf395649f83c09f (patch) | |
tree | e55aed646a9347e01f581adde9c8e74f0b22ade7 /contrib/cmdclient/console.py | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff) | |
parent | Merge pull request #5991 from matrix-org/erikj/fix_tracing_funcs (diff) | |
download | synapse-39883e85bd2ada6fcf2b56be5bf395649f83c09f.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'contrib/cmdclient/console.py')
-rwxr-xr-x | contrib/cmdclient/console.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/cmdclient/console.py b/contrib/cmdclient/console.py |