Merge branch 'MDL-60671-master' of https://github.com/sammarshallou/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 7 Nov 2017 03:05:43 +0000 (11:05 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 7 Nov 2017 03:05:43 +0000 (11:05 +0800)
commit8aa01fcf61a4ff493d10ad38391e36571fc5b781
treed35af2e734f6d0dea51cb7cb2ebf2f0979ab947f
parent8072eb13847a394aba6e62e72eaeffa6afbf9634
parent11e60032be40941e5e81e220c84291b9d30294b5
Merge branch 'MDL-60671-master' of https://github.com/sammarshallou/moodle
lib/weblib.php