Merge branch 'dev'

This commit is contained in:
Alex Yatskov 2017-12-30 13:09:50 -08:00
commit af716fa556

View File

@ -217,7 +217,8 @@ class AjaxServer:
def resetHeaders(self): def resetHeaders(self):
self.headers = [ self.headers = [
['HTTP/1.1 200 OK', None], ['HTTP/1.1 200 OK', None],
['Content-Type', 'text/json'] ['Content-Type', 'text/json'],
['Access-Control-Allow-Origin', '*']
] ]
self.extraHeaders = {} self.extraHeaders = {}