Merge branch 'MDL-65206-master' of git://github.com/tobiasreischmann/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 29 Apr 2019 04:44:33 +0000 (12:44 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 29 Apr 2019 04:44:33 +0000 (12:44 +0800)
1  2 
calendar/lib.php

Simple merge