summary refs log tree commit diff
path: root/contrib/experiments
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-30 14:09:32 +0000
committerErik Johnston <erik@matrix.org>2015-01-30 14:09:32 +0000
commit2aaedab2033119efb8c22fc2941aa341ea1e9de9 (patch)
tree14fd6e4eda613a51dda6736e2e672add87a2f723 /contrib/experiments
parentRemove commented line (diff)
parentWe do need Twisted 14, not 15: we use internal Twisted things that have been ... (diff)
downloadsynapse-2aaedab2033119efb8c22fc2941aa341ea1e9de9.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into new_state_resolution
Diffstat (limited to '')
-rw-r--r--contrib/experiments/cursesio.py (renamed from experiments/cursesio.py)0
-rw-r--r--contrib/experiments/test_messaging.py (renamed from experiments/test_messaging.py)0
2 files changed, 0 insertions, 0 deletions
diff --git a/experiments/cursesio.py b/contrib/experiments/cursesio.py

index 95d87a1fda..95d87a1fda 100644 --- a/experiments/cursesio.py +++ b/contrib/experiments/cursesio.py
diff --git a/experiments/test_messaging.py b/contrib/experiments/test_messaging.py
index fedf786cec..fedf786cec 100644 --- a/experiments/test_messaging.py +++ b/contrib/experiments/test_messaging.py