Merge branch 'wip-MDL-60926-master' of git://github.com/marinaglancy/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 5 Dec 2017 06:03:45 +0000 (19:03 +1300)
committerJun Pataleta <jun@moodle.com>
Wed, 6 Dec 2017 06:53:35 +0000 (19:53 +1300)
commit1396cb63467b0ab3a6780f20ae7f115ab862bfdb
tree3fee7cba5067cbc09a0988505d8eac4cd20fe611
parentbfb5d3ba266c158f912be571b40ac943eaf814af
parent65a77c7381ab968c7c5a401627e16feb726cce8d
Merge branch 'wip-MDL-60926-master' of git://github.com/marinaglancy/moodle
lib/moodlelib.php