Merge branch 'MDL-60434_master' of git://github.com/dmonllao/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 26 Oct 2017 05:11:46 +0000 (13:11 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 26 Oct 2017 05:11:46 +0000 (13:11 +0800)
commit1e67827131e6743bb71503192820ffb4b63bc76d
tree229114818faf5366a22190b4f4d1435f64f6eceb
parent7dfc9ea6b33d17a1d095d76c491e0577900a6237
parent3a89d0b5416989725058011112504882ee007ca9
Merge branch 'MDL-60434_master' of git://github.com/dmonllao/moodle