Merge branch 'MDL-59106_master-fix2' of git://github.com/dmonllao/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 12 Oct 2017 02:54:47 +0000 (10:54 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 12 Oct 2017 02:54:47 +0000 (10:54 +0800)
commitc36907bf5ad33bb4f90942a9180a718251aff430
tree4b1b725a13215c7be3569483bb85d45c3605d32c
parentcb9a803d802d86341cac3f41cf61ec79bea68138
parentd4fc830c6fb5129186e8ce123f2214fea19eda15
Merge branch 'MDL-59106_master-fix2' of git://github.com/dmonllao/moodle