Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_federation

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/rest/client/transactions.py b/synapse/rest/client/transactions.py

index 00b1b3066e..511e96ab00 100644
--- a/synapse/rest/client/transactions.py
+++ b/synapse/rest/client/transactions.py
@@ -17,7 +17,7 @@
 to ensure idempotency when performing PUTs using the REST API."""
 import logging
 
-from synapse.util.async import ObservableDeferred
+from synapse.util.async_helpers import ObservableDeferred
 from synapse.util.logcontext import make_deferred_yieldable, run_in_background
 
 logger = logging.getLogger(__name__)