Merge branch 'UCSFCLE_403_DEVEL' into ucsf_theme_update_v2024061000

ucsf-education · Jun 18, 2024 · 4979227 · 4979227
2 parents e91605a + 3702bea
commit 4979227
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "admin/tool/externaltaskmonitor"]
 	path = admin/tool/externaltaskmonitor
 	url = https://github.com/ucsf-education/tool_externaltaskmonitor
-	branch = MOODLE_403_DEVEL
+	branch = MOODLE_403_STABLE
 [submodule "admin/tool/ilioscategoryassignment"]
 	path = admin/tool/ilioscategoryassignment
 	url = https://github.com/ilios/tool_ilioscategoryassignment
@@ -192,7 +192,7 @@
 [submodule "filter/ucsfezproxy"]
 	path = filter/ucsfezproxy
 	url = https://github.com/ucsf-education/moodle-filter_ucsfezproxy
-	branch = MOODLE_403_DEVEL
+	branch = MOODLE_403_STABLE
 [submodule "lib/editor/atto/plugins/fontsize"]
 	path = lib/editor/atto/plugins/fontsize
 	url = https://github.com/andrewnicols/moodle-atto_fontsize

diff --git a/admin/tool/externaltaskmonitor b/admin/tool/externaltaskmonitor
diff --git a/filter/ucsfezproxy b/filter/ucsfezproxy
+4 −1		.github/workflows/ci.yml
+1 −0		tests/filter_test.php
+1 −1		version.php