Merge branch 'MDL-58926-ajax-timer' of https://github.com/rboyatt/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 2 Jul 2020 01:37:00 +0000 (09:37 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 2 Jul 2020 01:37:00 +0000 (09:37 +0800)

Trivial merge