Merge branch 'wip-MDL-60335-master' of git://github.com/marinaglancy/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 19 Oct 2017 02:39:56 +0000 (15:39 +1300)
committerJun Pataleta <jun@moodle.com>
Thu, 19 Oct 2017 02:39:56 +0000 (15:39 +1300)
1  2 
lib/adminlib.php

Simple merge