Merge branch 'MDL-60967-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 16 Jan 2018 11:36:27 +0000 (12:36 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 16 Jan 2018 11:36:27 +0000 (12:36 +0100)
commitabf089f2a30e7c691f025ac4c639d85821793649
tree8c0a5b99b5449a5e5c909ae452989dd3c49521a8
parent174fbacc9be44167d134dd50f1b58b434ba91812
parent60908b2187422b255ab7b228f8ccfd2ea97391d8
Merge branch 'MDL-60967-master' of git://github.com/ryanwyllie/moodle
calendar/lib.php