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)
commit60236650d6535e2712736c1e57a84a0b39446147
tree49048af7093f47a2c9b85016eed8bf26b0636067
parent80d7aa1813acd67e5b7cfdda3d889a9d9eff3117
parent0ef41ee07d66cb8ed01bfef632b9567eed294d83
Merge branch 'MDL-60962-master' of git://github.com/ryanwyllie/moodle
calendar/lib.php