Merge branch 'MDL-69600-divertemails-MOODLE_310_STABLE' of https://github.com/brendan...
authorJun Pataleta <jun@moodle.com>
Tue, 29 Sep 2020 12:27:36 +0000 (20:27 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 29 Sep 2020 12:27:36 +0000 (20:27 +0800)

Trivial merge