Merge branch 'MDL-60361-master' of git://github.com/andrewnicols/moodle
commiteb354bdefa21895f3682378eb9d0bc02475b7a64
authorJake Dallimore <jake@moodle.com>
Mon, 6 Nov 2017 01:29:46 +0000 (6 09:29 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 6 Nov 2017 01:29:46 +0000 (6 09:29 +0800)
tree81d46b9a1bdd9f653eb7afacf697d6dc0c910171
parent6a973d261aaa7ae1349e513f98324e03844da83f
parentb9fd51640761791afe5dda52764566686167cf3b
Merge branch 'MDL-60361-master' of git://github.com/andrewnicols/moodle
calendar/lib.php
lib/db/upgrade.php
version.php