Merge branch 'MDL-47899-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 11 Jul 2018 10:29:23 +0000 (12:29 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 11 Jul 2018 10:29:23 +0000 (12:29 +0200)
commitc2164bff0dcba3fa1535fbb14f9ffc7511c5e89d
tree30dd54e384570244f45eff5a3e6da93b9ea48bb5
parentfd2b5d5c6304c229f9d0548b684ff3e4978983e1
parentaab977e0ce12a88c758341da37c9d0ea067d98a6
Merge branch 'MDL-47899-master' of https://github.com/lucaboesch/moodle