Merge branch 'MDL-59393-master-2' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 23 Aug 2017 01:44:01 +0000 (09:44 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 23 Aug 2017 01:44:01 +0000 (09:44 +0800)
commit6ca4e646066b2257307123058b63e8a20a9c7571
tree97cc8c7a081b7c464e872ab3d193c032b901a3a6
parentac92b9d2a97d3572764fe0b64ccd7d7c283c2b6d
parentca518350ff3ede337294e67385b494d7aec102ee
Merge branch 'MDL-59393-master-2' of git://github.com/ryanwyllie/moodle
calendar/classes/external/event_exporter.php
version.php