Merge branch 'MDL-61042-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 18 Dec 2017 16:26:48 +0000 (17:26 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 18 Dec 2017 16:26:48 +0000 (17:26 +0100)
commit4ea34b6d65179d7e64c02082bb49442cb1f2cb97
treeb12f474c38a392ed9ee17ed2fa36b1c9c9b5eff4
parent7bce505885ea09123826b93a7fc364b055149e94
parent409da21320c94b218983afe025ac372e5e538979
Merge branch 'MDL-61042-master' of git://github.com/junpataleta/moodle