mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-08-14 16:45:33 -04:00
Merge branch 'develop' into event_signing
Conflicts: synapse/federation/replication.py
This commit is contained in:
commit
dc3c2823ac
21 changed files with 101 additions and 849 deletions
|
@ -75,7 +75,7 @@ class PduCodecTestCase(unittest.TestCase):
|
|||
context="rooooom",
|
||||
pdu_type="m.room.message",
|
||||
origin="bar.com",
|
||||
ts=12345,
|
||||
origin_server_ts=12345,
|
||||
depth=5,
|
||||
prev_pdus=[("alice", "bob.com")],
|
||||
is_state=False,
|
||||
|
@ -130,7 +130,7 @@ class PduCodecTestCase(unittest.TestCase):
|
|||
context="rooooom",
|
||||
pdu_type="m.room.topic",
|
||||
origin="bar.com",
|
||||
ts=12345,
|
||||
origin_server_ts=12345,
|
||||
depth=5,
|
||||
prev_pdus=[("alice", "bob.com")],
|
||||
is_state=True,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue