Merge branch 'MDL-59751-master-v2' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 5 Oct 2017 06:53:31 +0000 (14:53 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 5 Oct 2017 06:53:31 +0000 (14:53 +0800)
commit96c27b3658cbe1787f4fad4c4c9557fb20c55d3d
tree8e92d8e1b7f4a0398af0f5fd6f5ece7520892ed6
parent199d387d6ec712b1875dc36d6c869a19a6dd15b7
parenta873ed2f375ad3163b2e5014758dfce1d5d09abe
Merge branch 'MDL-59751-master-v2' of git://github.com/lameze/moodle
calendar/externallib.php
calendar/lib.php