Merge branch 'MDL-69645-310' of git://github.com/lucaboesch/moodle into MOODLE_310_STABLE
authorSara Arjona <sara@moodle.com>
Wed, 9 Sep 2020 09:00:49 +0000 (11:00 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 9 Sep 2020 09:00:49 +0000 (11:00 +0200)
commitd945333b4793ee70bf59eef4df1aa49ceaf9d9da
tree1af416543bc9dee83d4e26401437fd3bda7d6071
parentda84b731c72503b8cb0e0fd5c0dde9b56d1ddcdc
parentb2995f7a299b71e9dc2f9b5106b91130a3797b0b
Merge branch 'MDL-69645-310' of git://github.com/lucaboesch/moodle into MOODLE_310_STABLE