Merge branch 'MDL-60948-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 11 Dec 2017 04:52:23 +0000 (12:52 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 11 Dec 2017 04:52:23 +0000 (12:52 +0800)
commitc6a507e9e714689186ca249297dde6795cc29ffe
tree6185f4ce3809346b97ae47759ea24b175fd62c35
parent917923c8601cef00a7cbec10780ec08125bbd92a
parentb9819842d9299278d1a9a4e79470844f6a58272e
Merge branch 'MDL-60948-master' of git://github.com/andrewnicols/moodle