Merge branch 'MDL-61764_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 24 Apr 2018 01:54:16 +0000 (09:54 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 24 Apr 2018 01:54:16 +0000 (09:54 +0800)
commit68d7e891b95f90480ebe92615e6ccf6f57512080
treef93f15bee1fd9ac9a0c4555890d27bfdf798f8fb
parent74329331aa188d6c61b4edd7a7c43da0fedf8adf
parent10efd23b7c2fb6e64932fc23deae886b4ed46255
Merge branch 'MDL-61764_master' of git://github.com/markn86/moodle