Merge branch 'MDL-63673-34' of git://github.com/mihailges/moodle into MOODLE_34_STABLE
commit323c40787454f0c1257dd1672932de2ad82f824b
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 26 Oct 2018 03:42:29 +0000 (26 11:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 26 Oct 2018 03:42:29 +0000 (26 11:42 +0800)
tree8035c7b7a13f289bfdaac4274f6b2f0ef390ab3f
parent0ada140505e5feb174b5ba39469e7323e43e1f56
parentb36794f0f8c6657703a32674936235b063895f33
Merge branch 'MDL-63673-34' of git://github.com/mihailges/moodle into MOODLE_34_STABLE