Merge branch 'MDL-61724-master' of git://github.com/mihailges/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 21:38:59 +0000 (23:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 21:38:59 +0000 (23:38 +0200)
1  2 
lib/moodlelib.php

Simple merge