Merge branch 'MDL-69475_310' of https://github.com/stronk7/moodle into MOODLE_310_STABLE
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 19 Aug 2020 02:42:51 +0000 (10:42 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 19 Aug 2020 02:42:51 +0000 (10:42 +0800)
commitbf84a08900cb63365da84d054b8eb24a1eb010dd
treef02d64781b38bf0ae4ea364cc29f8caaec176804
parent97043c76b78b765722e659e5ecbb68ad57595eff
parent12ffcc5097aae99d052dd8dc6e1db42251d8b1e4
Merge branch 'MDL-69475_310' of https://github.com/stronk7/moodle into MOODLE_310_STABLE