Merge branch 'MDL-62151-master' of git://github.com/bmbrands/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 4 May 2018 02:55:50 +0000 (10:55 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 4 May 2018 02:55:50 +0000 (10:55 +0800)
commit66156ad24502e0c399cea3a35c809ac67b0539f3
tree1e7a2fadee754596e3856b6c284ea28f43b3234e
parent1c73a11a202f83ab7412c299ca50664641c2c420
parent5e92cf33c53efcba6dd3fa8ed950098c237d651f
Merge branch 'MDL-62151-master' of git://github.com/bmbrands/moodle