Merge branch 'MDL-60626-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 6 Nov 2017 04:43:24 +0000 (12:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 6 Nov 2017 04:43:24 +0000 (12:43 +0800)
commitf3743b3041b663b4f1c488174086d10cbe4f3d07
treee2de49d13683475b0b3e8603b1d154ff958c241b
parentef29782f317f50089f45d700a4a09c1c7325d186
parent30890c297133be1c2dbfd93919c5ae04d4d19e34
Merge branch 'MDL-60626-master' of git://github.com/damyon/moodle
calendar/lib.php