summary refs log tree commit diff
path: root/tests/appservice
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-04-13 11:27:29 +0100
committerRichard van der Hoff <richard@matrix.org>2018-04-13 11:27:29 +0100
commitf56db48f67a9c1fb5f90e9e99481402c27bb365a (patch)
treeeea617f2c326751c7dfd9bfac68636ef12aefc1f /tests/appservice
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentRevert "Use sortedcontainers instead of blist" (diff)
downloadsynapse-erik-hackery.tar.xz
Merge branch 'develop' into matrix-org-hotfixes github/erik-hackery erik-hackery
Diffstat (limited to 'tests/appservice')
0 files changed, 0 insertions, 0 deletions