summary refs log tree commit diff
path: root/tests/api
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-14 17:44:46 +0100
committerNeil Johnson <neil@matrix.org>2018-08-14 17:44:46 +0100
commit19b433e3f42d29bbc22ccf919b5dbdb0e88e5fdc (patch)
tree6b3fc312c783390b2d984ddf30310a996ddd276e /tests/api
parentremove blank line (diff)
parentMerge pull request #3692 from matrix-org/neil/fix_postgres_test_initialise_re... (diff)
downloadsynapse-19b433e3f42d29bbc22ccf919b5dbdb0e88e5fdc.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email
Diffstat (limited to 'tests/api')
0 files changed, 0 insertions, 0 deletions