Merge branch 'MDL-62159-master' of git://github.com/bmbrands/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 25 Apr 2018 15:57:37 +0000 (17:57 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 25 Apr 2018 15:57:37 +0000 (17:57 +0200)
commite06a28b5396823f1274467e2889d6b8dae3a7d21
treef6cbc5d2cfdda17f10fe3cbf24ac5ee0be0739c6
parent6fb429dd79e7243b7402cdfbb12f4cbb2932f05a
parentb6ebda707f2cbf10ab486e82272d621624014647
Merge branch 'MDL-62159-master' of git://github.com/bmbrands/moodle