Merge branch 'develop' into key_distribution

Conflicts:
	synapse/config/homeserver.py

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/util/retryutils.py b/synapse/util/retryutils.py

index 4e82232796..a42138f556 100644
--- a/synapse/util/retryutils.py
+++ b/synapse/util/retryutils.py
@@ -60,7 +60,7 @@ def get_retry_limiter(destination, clock, store, **kwargs):
 
     if retry_timings:
         retry_last_ts, retry_interval = (
-            retry_timings.retry_last_ts, retry_timings.retry_interval
+            retry_timings["retry_last_ts"], retry_timings["retry_interval"]
         )
 
         now = int(clock.time_msec())