Merge branch 'MDL-61974-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 16 Apr 2018 05:17:21 +0000 (13:17 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 16 Apr 2018 05:17:21 +0000 (13:17 +0800)
commitcdd11481b454ce2df71b24f61e2a1c8e47e94785
tree1f032fbf5cf7186052fd72460fdf486c10019dc3
parent3224e06de4a239ae88b60d9343983c0606a0bc0c
parentae6072b892cff537ec330232b70b4c7ea82ce327
Merge branch 'MDL-61974-master' of git://github.com/andrewnicols/moodle