Merge branch 'MDL-63241-master-take2' of https://github.com/lucaboesch/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 9 Oct 2018 04:49:07 +0000 (12:49 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 9 Oct 2018 04:49:07 +0000 (12:49 +0800)
commit6a28761848cd2247d33a2d26be3c0c3162dafce3
treeb1ebad500f360669605cc92391a89a19b060b8ac
parentf849b0faa99c53f68f66d1335e04eda829a3a257
parent7294f412fc55ce5a4bfa38ff544b5976912e7dbe
Merge branch 'MDL-63241-master-take2' of https://github.com/lucaboesch/moodle