Merge branch 'develop' into matrix-org-hotfixes

1 files changed, 2 insertions, 2 deletions

diff --git a/synapse/api/errors.py b/synapse/api/errors.py

index 227a0713b2..6074df292f 100644
--- a/synapse/api/errors.py
+++ b/synapse/api/errors.py
@@ -17,11 +17,11 @@
 
 import logging
 
-from canonicaljson import json
-
 from six import iteritems
 from six.moves import http_client
 
+from canonicaljson import json
+
 logger = logging.getLogger(__name__)