Merge branch 'MDL-62418-master' of git://github.com/mihailges/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 14 May 2018 08:17:58 +0000 (10:17 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 14 May 2018 08:17:58 +0000 (10:17 +0200)
commit62b94b486e30675d6952ee2cb9a69ee5ecd14478
tree177d02697bd429294d06c30dde10fb6962071f50
parentf8630a81705286b81850ed445e8f062b4d855c31
parent0bffcfccdd554bad174b4c1252f6dc69a3458b57
Merge branch 'MDL-62418-master' of git://github.com/mihailges/moodle