Merge branch 'MDL-68688-310' of git://github.com/aanabit/moodle into MOODLE_310_STABLE
commitbf127517b3cd6fc7d20307b2d98459eee42d9c11
authorSara Arjona <sara@moodle.com>
Wed, 16 Sep 2020 15:03:27 +0000 (16 17:03 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 17 Sep 2020 07:16:52 +0000 (17 09:16 +0200)
tree5e947ed038558e77d0b4cfb113d59dcac14b4e1d
parent29e56fef7276d29327a9cc2a77cc36fd54e9d42b
parentabb2037b0f8f7690a87336c0f16331928fc007f4
Merge branch 'MDL-68688-310' of git://github.com/aanabit/moodle into MOODLE_310_STABLE