summary refs log tree commit diff
path: root/synapse/appservice/api.py
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2016-12-06 11:45:55 +0000
committerGitHub <noreply@github.com>2016-12-06 11:45:55 +0000
commit5a2c33c12eb8a368173dc246a9e78d6732c31760 (patch)
tree2d12f9f67f56f7af9ce49a45ecf9f6130fafcf7e /synapse/appservice/api.py
parentMerge pull request #653 from matrix-org/erikj/preset_guest_join (diff)
parentFix unittests under tox (diff)
downloadsynapse-5a2c33c12eb8a368173dc246a9e78d6732c31760.tar.xz
Merge pull request #1673 from matrix-org/rav/fix_tox_tests
Fix unittests under tox
Diffstat (limited to 'synapse/appservice/api.py')
0 files changed, 0 insertions, 0 deletions