Merge branch 'MDL-62594-master' of git://github.com/bmbrands/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 11 Jun 2018 05:55:43 +0000 (13:55 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 11 Jun 2018 05:55:43 +0000 (13:55 +0800)
commit15b3d284f3e9c4d2fb8d5adc168832187d83357e
treec3c15783dba5afc04ec1213bae3d232aae023415
parent5e12ab5ef25fcbb299263bf4014cf1a08199acd1
parentf2b71ab281064353d9b5df6ce21e6d1eda4fc2cc
Merge branch 'MDL-62594-master' of git://github.com/bmbrands/moodle