Merge branch 'MDL-62227-master' of git://github.com/bmbrands/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 3 May 2018 13:49:43 +0000 (15:49 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 3 May 2018 13:49:43 +0000 (15:49 +0200)
commit647404446485b345075af6452a78c7177de21f86
treed98f976b2e71083d842d56973edb779bbe000245
parent545e2b4ec7ae566e7733e38b1d277bebfb5a8d04
parentc3f2290d1184983620a02af2639f571520c12d86
Merge branch 'MDL-62227-master' of git://github.com/bmbrands/moodle