Merge branch 'MDL-62286-master' of git://github.com/sarjona/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 7 May 2018 02:05:24 +0000 (10:05 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 7 May 2018 02:05:24 +0000 (10:05 +0800)
commit23fbd252db751c9dfced5d4c618c47be3a743e07
tree10b2acbb3bcd9f24cb52254ac6e9627867e54864
parent97f1c1f42404b3dc1d58d0dbb290f97cf7ddaf82
parent54659fd14d3c7002efa285121065afeb6560d5b5
Merge branch 'MDL-62286-master' of git://github.com/sarjona/moodle