Merge branch 'fix/MDL-52666' of https://github.com/mikr0/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Jun 2018 15:36:19 +0000 (17:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Jun 2018 15:36:19 +0000 (17:36 +0200)
1  2 
lib/moodlelib.php

Simple merge