summary refs log tree commit diff
path: root/tests/federation/test_complexity.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-10-20 18:10:20 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-20 18:10:20 +0100
commit15212f54f98355505cabc8c1a72f151d8f59febd (patch)
tree94dc15318379c6e72b9a0118784828fa456fc079 /tests/federation/test_complexity.py
parentMerge commit '7513006b0' into anoa/dinsic_release_1_21_x (diff)
parentMerge branch 'release-v1.20.0' into develop (diff)
downloadsynapse-15212f54f98355505cabc8c1a72f151d8f59febd.tar.xz
Merge commit '77b4711bc' into anoa/dinsic_release_1_21_x
* commit '77b4711bc':
  Add cross-signing sigs to the `keys` object (#8234)
  Unread counts fixes (#8254)
  Fix a regression from calling read_templates. (#8252)
Diffstat (limited to 'tests/federation/test_complexity.py')
0 files changed, 0 insertions, 0 deletions