Merge branch 'MDL-60962-master' of git://github.com/ryanwyllie/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 3 Jan 2018 08:53:49 +0000 (16:53 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 3 Jan 2018 08:53:49 +0000 (16:53 +0800)
1  2 
calendar/lib.php

Simple merge