Merge branch 'MDL-60813-master' of git://github.com/jleyva/moodle
commit9ff02b52b2024738b8e7202f1675aa17593a6c75
authorJun Pataleta <jun@moodle.com>
Wed, 22 Nov 2017 04:45:40 +0000 (22 17:45 +1300)
committerDavid Monllao <davidm@moodle.com>
Wed, 22 Nov 2017 12:24:33 +0000 (22 13:24 +0100)
tree38f05aa5bc4ca6f12acec870c1b001f94217a53b
parentfd64ae31400b309f42e4aaf5bffef46860916984
parent44ae08383ba4c2866a2b7e25f97e0df8c3683c8d
Merge branch 'MDL-60813-master' of git://github.com/jleyva/moodle
calendar/externallib.php