Merge branch 'MDL-62326-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 7 May 2018 10:09:40 +0000 (12:09 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 7 May 2018 10:09:40 +0000 (12:09 +0200)
commit775db1409ed0c2f85b9d324e7c4b0fa8cf0fd1ee
tree93b46880876f35218a565fc144fc7972fe3fd86d
parentb175d43408c317c02ee557cbc02dd287897a5b08
parentaad32d11f595a3d7db6a19b147a23cfb53c0e194
Merge branch 'MDL-62326-master' of git://github.com/andrewnicols/moodle