From 91206e09f2831d2cbc499189ad5ee8f4bc9dcaac Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Sun, 9 Dec 2018 17:39:22 +0000
Subject: [PATCH] changelog & isort

---
 changelog.d/4279.bugfix                  | 1 +
 synapse/rest/media/v1/config_resource.py | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/4279.bugfix

diff --git a/changelog.d/4279.bugfix b/changelog.d/4279.bugfix
new file mode 100644
index 000000000..12de4f44c
--- /dev/null
+++ b/changelog.d/4279.bugfix
@@ -0,0 +1 @@
+Send CORS headers for /media/config
diff --git a/synapse/rest/media/v1/config_resource.py b/synapse/rest/media/v1/config_resource.py
index 8c3adf6c6..9b97da213 100644
--- a/synapse/rest/media/v1/config_resource.py
+++ b/synapse/rest/media/v1/config_resource.py
@@ -18,7 +18,11 @@ from twisted.internet import defer
 from twisted.web.resource import Resource
 from twisted.web.server import NOT_DONE_YET
 
-from synapse.http.server import respond_with_json, wrap_json_request_handler, set_cors_headers
+from synapse.http.server import (
+    respond_with_json,
+    set_cors_headers,
+    wrap_json_request_handler,
+)
 
 
 class MediaConfigResource(Resource):