Merge branch 'MDL-69146_310' of https://github.com/stronk7/moodle into MOODLE_310_STABLE
authorSara Arjona <sara@moodle.com>
Thu, 8 Oct 2020 10:43:29 +0000 (12:43 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 8 Oct 2020 10:43:29 +0000 (12:43 +0200)
commitd487ee2240c11b2e877131516ef7a4a7891a8992
treeebbb0fc0606ea9347c0c479d45ed8f104fde92ef
parenteefa5c928f0498f83f26dec48f29b546014165cc
parentfadd2915ebd0e69eeb1410f01ed432b8cfb8adf9
Merge branch 'MDL-69146_310' of https://github.com/stronk7/moodle into MOODLE_310_STABLE