Merge branch 'MDL-60842-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 20 Nov 2017 09:27:58 +0000 (10:27 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 20 Nov 2017 09:27:58 +0000 (10:27 +0100)
1  2 
calendar/lib.php

Simple merge