Merge branch 'MDL-31521-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 18 Dec 2017 12:14:22 +0000 (13:14 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 18 Dec 2017 12:14:22 +0000 (13:14 +0100)
commitf71a4993c76dea5ed979fbff5b3f3dcd28d7a91a
tree8fe8e79a79ca43cb0cf0838d187c44ba3b654e16
parent10d22cceb53ed65208e422169df9b537aff20cef
parente00e36fa4f4e5616e6565c51fa9232bee27aef77
Merge branch 'MDL-31521-master' of https://github.com/lucaboesch/moodle