Merge branch 'MDL-46415-master' of https://github.com/lucaboesch/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 10 Oct 2018 04:05:44 +0000 (12:05 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 10 Oct 2018 04:05:44 +0000 (12:05 +0800)
commit3151c3b98bce1ea23c7fd7c89b08d76c9a513f3c
treee0970fc26787b803751374120df28a7720cca7d7
parent89957b6c34f550b51bb85f3b94e19a740198fc92
parentb80f15efca4402d2582301480d733a6d21688c68
Merge branch 'MDL-46415-master' of https://github.com/lucaboesch/moodle