Merge branch 'wip-MDL-60742-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 9 Jan 2018 08:52:44 +0000 (09:52 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 9 Jan 2018 08:52:44 +0000 (09:52 +0100)
commit51673a34697bae749e18d9533cdf11f32b718454
tree5dc9dc4cdd3a641f37b46184d4cdb5bd2701b8ae
parent1679485693320f201b845095630a5b00a3579c3e
parent099bca6de616912f5a60c399e68280ca90e163c1
Merge branch 'wip-MDL-60742-master' of git://github.com/marinaglancy/moodle
calendar/lib.php