Merge branch 'MDL-60963-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 17 Jan 2018 09:49:58 +0000 (10:49 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 17 Jan 2018 09:49:58 +0000 (10:49 +0100)
commit09896c35f2b3ea3ca020f50b6a95c4cbc6f8881c
treee4498f4d8e0c39ca260184807600e1b6fb5bfd7f
parent2ab36722f24d118dd0c7695193259d6e6b4b9098
parent3152de6a8d5eb5db15543e4df4a60176e697eed9
Merge branch 'MDL-60963-master' of git://github.com/ryanwyllie/moodle
calendar/classes/external/calendar_event_exporter.php