Merge branch 'MDL-69308' of https://github.com/stronk7/moodle

diff --cc auth/shibboleth/db/upgrade.php
index 9553db8,0288664..6cbabb3
--- 1/auth/shibboleth/db/upgrade.php
--- 2/auth/shibboleth/db/upgrade.php
+++ b/auth/shibboleth/db/upgrade.php
@@@ -30,11 -30,8 +30,8 @@@ defined('MOODLE_INTERNAL') || die()
   * @return bool result
   */
  function xmldb_auth_shibboleth_upgrade($oldversion) {
 -    global $CFG, $DB;
 +    global $CFG, $DB, $OUTPUT;
  
-     // Automatically generated Moodle v3.5.0 release upgrade line.
-     // Put any upgrade step following this.
- 
      // Automatically generated Moodle v3.6.0 release upgrade line.
      // Put any upgrade step following this.
  

diff --cc question/type/essay/db/upgrade.php
Simple merge