diff options
| author | Patrick Cloke <patrickc@matrix.org> | 2021-06-02 11:38:54 -0400 |
|---|---|---|
| committer | Patrick Cloke <patrickc@matrix.org> | 2021-06-02 11:38:54 -0400 |
| commit | 09361655d2fcdac24642efa2b60122dd4f0684be (patch) | |
| tree | a8a245f6185f6102b47b6b35fbd33a47d8447571 /synapse/storage/databases/main/room.py | |
| parent | Merge remote-tracking branch 'origin/release-v1.35' into matrix-org-hotfixes (diff) | |
| parent | Rewrite the KeyRing (#10035) (diff) | |
| download | synapse-09361655d2fcdac24642efa2b60122dd4f0684be.tar.xz | |
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/storage/databases/main/room.py')
| -rw-r--r-- | synapse/storage/databases/main/room.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/databases/main/room.py b/synapse/storage/databases/main/room.py index 5f38634f48..0cf450f81d 100644 --- a/synapse/storage/databases/main/room.py +++ b/synapse/storage/databases/main/room.py @@ -1498,7 +1498,7 @@ class RoomStore(RoomBackgroundUpdateStore, RoomWorkerStore, SearchStore): room_id: str, event_id: str, user_id: str, - reason: str, + reason: Optional[str], content: JsonDict, received_ts: int, ) -> None: |