Merge branch 'MDL-60307-master' of git://github.com/lameze/moodle
commit55b5133595c36a6c2f10fcddc22dac2d66810ef1
authorJun Pataleta <jun@moodle.com>
Mon, 16 Oct 2017 05:43:22 +0000 (16 13:43 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 16 Oct 2017 05:43:22 +0000 (16 13:43 +0800)
tree5b55d0151be0a4a8e772a49286391356a54539ad
parent6dc633fd93be0e71eb8a0446b2af80d649a96d7c
parent166cd10aa72c6267d3c21bf5b701165c040d2d51
Merge branch 'MDL-60307-master' of git://github.com/lameze/moodle