Merge branch 'MDL-59595-master-2' of git://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Aug 2018 22:21:23 +0000 (00:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Aug 2018 22:21:23 +0000 (00:21 +0200)
1  2 
lib/adminlib.php

Simple merge