Merge branch 'MDL-57898-master' of git://github.com/marinaglancy/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 18 Jan 2019 14:21:23 +0000 (22:21 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 18 Jan 2019 14:21:23 +0000 (22:21 +0800)
commitc01388f7135e57fa810fe3601443740de8731e32
treebd22c130a575e3aa170eccca3b357771a5e8c4c4
parent3009dcb803f675cd30e390b80a377f730f457cd2
parentd1fc4bdc1eea5d3bee8f36c41f7364bf305a776f
Merge branch 'MDL-57898-master' of git://github.com/marinaglancy/moodle