summary refs log tree commit diff
path: root/contrib/cmdclient/console.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-11 10:33:19 +0000
committerErik Johnston <erik@matrix.org>2015-02-11 10:33:19 +0000
commitfb233dc40b3111e905e394e627b8ecc3b2a91e80 (patch)
tree931ab474f042b5eb5df9663306a4936406dcf17c /contrib/cmdclient/console.py
parentPEP8 (diff)
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-fb233dc40b3111e905e394e627b8ecc3b2a91e80.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federation-requests
Diffstat (limited to '')
-rwxr-xr-xcontrib/cmdclient/console.py (renamed from cmdclient/console.py)0
1 files changed, 0 insertions, 0 deletions
diff --git a/cmdclient/console.py b/contrib/cmdclient/console.py

index d9c6ec6a70..d9c6ec6a70 100755 --- a/cmdclient/console.py +++ b/contrib/cmdclient/console.py