Merge branch 'wip-MDL-60887-master' of git://github.com/marinaglancy/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 4 Dec 2017 05:24:15 +0000 (18:24 +1300)
committerJun Pataleta <jun@moodle.com>
Mon, 4 Dec 2017 05:24:15 +0000 (18:24 +1300)
commitd8c1a57b991e49b79596ea8d1632bd0260b0a94c
treecf3586256cc9263737db2c071546f4fa5508ef49
parentbea5a1620390a0650614fb10b60d00dca3444664
parent12a67a42664a7ccd22581c4abf5dc5aba384353a
Merge branch 'wip-MDL-60887-master' of git://github.com/marinaglancy/moodle