Merge branch 'wip-MDL-60742-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 9 Jan 2018 08:52:44 +0000 (09:52 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 9 Jan 2018 08:52:44 +0000 (09:52 +0100)
1  2 
calendar/lib.php

Simple merge