diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-01 13:42:50 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-08-01 13:42:50 +0100 |
commit | 303f1c851fc363d3fc4fc4c91328abd89863341d (patch) | |
tree | e8d8c1ba55141f3eae7aa8ea74a509e3dac42e28 /synapse/federation/units.py | |
parent | fix known broken test (diff) | |
parent | Merge pull request #3543 from bebehei/docker (diff) | |
download | synapse-303f1c851fc363d3fc4fc4c91328abd89863341d.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_in_log_in_limits
Diffstat (limited to 'synapse/federation/units.py')
-rw-r--r-- | synapse/federation/units.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/federation/units.py b/synapse/federation/units.py index bb1b3b13f7..c5ab14314e 100644 --- a/synapse/federation/units.py +++ b/synapse/federation/units.py @@ -73,7 +73,6 @@ class Transaction(JsonEncodedObject): "previous_ids", "pdus", "edus", - "pdu_failures", ] internal_keys = [ |