Merge branch 'MDL-62397-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 11 May 2018 11:14:05 +0000 (13:14 +0200)
committerDavid Monllao <davidm@moodle.com>
Fri, 11 May 2018 11:14:05 +0000 (13:14 +0200)
commitaaa1140d9ae3772e74b246a72ae839a2a1d0a9bf
tree7acb6c6f4d67b7f9516507352e36aea62e4f37c0
parentb96a064f14ecd75dd7cd2978855f76ee19442f97
parentddb1a1357359538d37c3f34d4a35ac717aec3f20
Merge branch 'MDL-62397-master' of git://github.com/andrewnicols/moodle