Merge branch 'master' into quince

overhangio · Nov 22, 2023 · cec994e · cec994e
2 parents 64f60b1 + 22fa480
commit cec994e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/setup.py b/setup.py
@@ -55,4 +55,4 @@ def load_about():
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
     ],
-)
+)
diff --git a/tutorcairn/patches/openedx-lms-production-settings b/tutorcairn/patches/openedx-lms-production-settings
@@ -0,0 +1 @@
+CORS_ORIGIN_WHITELIST.append("{% if ENABLE_HTTPS %}https://{% else %}http://{% endif %}{{ CAIRN_HOST }}")
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,4 +55,4 @@ def load_about(): @@
             "Programming Language :: Python :: 3.11",
             "Programming Language :: Python :: 3.12",
         ],
-    )
+    )
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CORS_ORIGIN_WHITELIST.append("{% if ENABLE_HTTPS %}https://{% else %}http://{% endif %}{{ CAIRN_HOST }}")