Merge branch 'MDL-59524-master' of git://github.com/cescobedo/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Aug 2019 04:56:32 +0000 (12:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Aug 2019 04:56:32 +0000 (12:56 +0800)
1  2 
calendar/lib.php

Simple merge