Merge branch 'MDL-60503-master' of git://github.com/damyon/moodle
commitd25f1c3c3ce70fa3e791dcca46f1c08013a8ab0a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Nov 2017 09:41:48 +0000 (1 10:41 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Nov 2017 09:41:48 +0000 (1 10:41 +0100)
treeea35e11e5a5c190bb608b1e8bf63671edfa16fb4
parent14a1672cffca1e8a38f52bbd63dfcc00b4f45fda
parent66242b95e02796323ee2691c09246b21444b54dc
Merge branch 'MDL-60503-master' of git://github.com/damyon/moodle