Merge branch 'MDL-62996-master' of git://github.com/junpataleta/moodle
commite980f89a4f6d586884a5de303fec1f63887aaa83
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 6 Aug 2018 04:10:51 +0000 (6 12:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 6 Aug 2018 04:10:51 +0000 (6 12:10 +0800)
tree739833c53fb1497035af3f86a45e2b0e9a0f0211
parentb4463cf9a7eb054fbe3f8dee1e30570ca6bbb82d
parentb1cc8171c0784af65f2b57a957dde89084ca1e54
Merge branch 'MDL-62996-master' of git://github.com/junpataleta/moodle