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)
1  2 
calendar/lib.php

Simple merge