Merge branch 'develop' into matrix-org-hotfixes

1 files changed, 1 insertions, 1 deletions

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

index bb46b5da8a..71347912f1 100644
--- a/synapse/api/urls.py
+++ b/synapse/api/urls.py
@@ -15,8 +15,8 @@
 # limitations under the License.
 
 """Contains the URL paths to prefix various aspects of the server with. """
-from hashlib import sha256
 import hmac
+from hashlib import sha256
 
 from six.moves.urllib.parse import urlencode