Merge branch 'MDL-60092-master' of git://github.com/lameze/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 10 Oct 2017 09:17:56 +0000 (17:17 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 10 Oct 2017 09:17:56 +0000 (17:17 +0800)
1  2 
calendar/lib.php

Simple merge