summary refs log tree commit diff
path: root/tests/test_test_utils.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-16 18:35:46 +0000
committerErik Johnston <erik@matrix.org>2014-12-16 18:35:46 +0000
commitf76269392b17d2dbabc85579300d9eef9a559d4e (patch)
tree94036377e17568e6983d6aeb2a73b827a277a580 /tests/test_test_utils.py
parentUse is_outlier() so that we don't get AttributeError (diff)
parentMerge branch 'release-v0.6.0' into develop (diff)
downloadsynapse-f76269392b17d2dbabc85579300d9eef9a559d4e.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.6.0
Conflicts:
	synapse/state.py
Diffstat (limited to 'tests/test_test_utils.py')
0 files changed, 0 insertions, 0 deletions