Merge branch 'MDL-55609-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 12 Jun 2018 08:07:35 +0000 (10:07 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 12 Jun 2018 08:07:35 +0000 (10:07 +0200)
commitbcb4a27dd6f7ab36b6010f249c0c213fab48974a
tree548e00633d3038c2fb054d2012f6adce443644e5
parentd49527613417aa7ae0454d0db1d43685bc865885
parentb762445485076decfa730b72a2f85dded7507429
Merge branch 'MDL-55609-master' of git://github.com/andrewnicols/moodle