Merge branch 'MDL-62025_master' of git://github.com/markn86/moodle
commit53036a68861dfcd8c00129e0f2a8ca7092c06b99
authorJun Pataleta <jun@moodle.com>
Thu, 19 Apr 2018 07:50:09 +0000 (19 15:50 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 19 Apr 2018 07:50:09 +0000 (19 15:50 +0800)
treeb03a5d98da1418add00530984d4557fd59e1ec30
parent2e2c66d84a977f28c832f80036b28f921d9c585c
parenta4f994f332d46b78574cbf7e7ec87c0eb303d8b3
Merge branch 'MDL-62025_master' of git://github.com/markn86/moodle