Merge branch 'MDL-62160-master' of git://github.com/bmbrands/moodle
commit969d649b799271c6bc9a0bf9e5f4edf76b20c699
authorDavid Monllao <davidm@moodle.com>
Wed, 25 Apr 2018 16:10:13 +0000 (25 18:10 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 25 Apr 2018 16:10:13 +0000 (25 18:10 +0200)
tree7cd98cb0cd6c56cdda839002e24bcbd7bbc05f46
parente06a28b5396823f1274467e2889d6b8dae3a7d21
parente58362ed1ec1b987b68f5b5628b451964da39de4
Merge branch 'MDL-62160-master' of git://github.com/bmbrands/moodle