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)
1  2 
calendar/lib.php

Simple merge