Merge branch 'MDL-59987_master-fix' of git://github.com/dmonllao/moodle
commita1a39eda7d38010cbc88c3b555590074949c6376
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Oct 2017 03:47:45 +0000 (18 11:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Oct 2017 03:47:45 +0000 (18 11:47 +0800)
tree0b5fb8558dfaf916b60959cd4404b187f55b82ee
parentb1a9a6a19aa56f2bb739fff88d67b906eca30c91
parent70dc5e0ab7ae14a95702fb92ebff201ccd36fbb7
Merge branch 'MDL-59987_master-fix' of git://github.com/dmonllao/moodle