Merge branch 'wip-MDL-45068-master-fix' of https://github.com/marinaglancy/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 29 Nov 2017 03:59:25 +0000 (16:59 +1300)
committerJun Pataleta <jun@moodle.com>
Wed, 29 Nov 2017 03:59:25 +0000 (16:59 +1300)
commit1577c5ea201c5510097d047c287a36407adbb880
tree3ad8293070cd271dd18e2b0df876984418bb2f95
parenta0de91e9a05c9b3a29c6b7fbaf516c0382dba22c
parentb955ad6a5503cea78e0085844fc3f1ccd342a923
Merge branch 'wip-MDL-45068-master-fix' of https://github.com/marinaglancy/moodle