Merge branch 'MDL-68789-38' of git://github.com/crazyserver/moodle into MOODLE_38_STABLE
commit2140fe5549340bc65ddfed2b8ef89ca223ec6c01
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 28 May 2020 08:47:06 +0000 (28 10:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 28 May 2020 08:47:06 +0000 (28 10:47 +0200)
tree24ee76a636b17e165f34b1c864a6bcbefee80005
parentf4163d27487e6de8b183ecdbf4a370f55f514b70
parentfc13b8c1a0c8b5b4b2276172cf955da1108e70a4
Merge branch 'MDL-68789-38' of git://github.com/crazyserver/moodle into MOODLE_38_STABLE