Merge branch 'develop'

2021-09-29 15:32:47 +02:00 · 2021-09-29 15:32:47 +02:00 · e92c16a732
parent 582f4f5bce f2351788e4
commit e92c16a732
1 changed files with 2 additions and 1 deletions
--- a/3
+++ b/3
@ -305,6 +305,7 @@ upgrade_plugins_moodle(){
    curl --location $MOODLE_THEME_CBE > tresipunt_theme_cbe.zip
    unzip tresipunt_theme_cbe.zip -d /tmp/moodle/theme/cbe/
    mv /tmp/moodle/theme/cbe/moodle_theme_cbe-master/* /tmp/moodle/theme/cbe/
+    mv /tmp/moodle/theme/cbe/moodle_theme_cbe-develop/* /tmp/moodle/theme/cbe/
    rm tresipunt_theme_cbe.zip

    mkdir -p /tmp/moodle/local/tresipuntimportgc
@ -413,4 +414,4 @@ fi

 if [ "$OPERATION" = "nextcloud-scan" ]; then
 	nextcloud_scan
-fi
+fi