summary refs log tree commit diff
path: root/tests/module_api/test_api.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-10-20 18:29:12 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-20 18:29:12 +0100
commit061b9895eb04349d862db7d15ca84bcd3b9911c7 (patch)
tree33a6c33f4f5f0c44f8676213392454b828763d45 /tests/module_api/test_api.py
parentMerge commit '525efab61' into anoa/dinsic_release_1_21_x (diff)
parentMerge tag 'v1.20.0rc1' into develop (diff)
downloadsynapse-061b9895eb04349d862db7d15ca84bcd3b9911c7.tar.xz
Merge commit 'cca03dbec' into anoa/dinsic_release_1_21_x
* commit 'cca03dbec':
  fix typo
  s/fixes/fix/
  Directly import json from the standard library. (#8259)
  Allow for make_awaitable's return value to be re-used. (#8261)
  Rename 'populate_stats_process_rooms_2' background job back to 'populate_stats_process_rooms' again (#8243)
Diffstat (limited to 'tests/module_api/test_api.py')
0 files changed, 0 insertions, 0 deletions