Merge branch 'MDL-54551_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jul 2018 22:26:16 +0000 (00:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jul 2018 22:26:16 +0000 (00:26 +0200)
commit75d4e6c4f13a68317c712ce6cc7644f370b740bf
tree22ac7dd63955ddb2f305b4ec744c088d647fe209
parent252905427cbfb9a38803fa739a40b44c5ec6ffc2
parentfeb6a5203541a95980e0524e9294c9dbee6e7b99
Merge branch 'MDL-54551_master' of git://github.com/markn86/moodle