Merge branch 'MDL-61281_master' of git://github.com/dmonllao/moodle
commitaa783806304401ef3a7e32ba407b16cd13b1d7dd
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Jan 2018 22:59:36 +0000 (29 23:59 +0100)
committerJake Dallimore <jake@moodle.com>
Thu, 1 Feb 2018 02:33:16 +0000 (1 10:33 +0800)
treeb2a7998a93b74b0c1a3a69fc9030ef686bcc68f6
parente9fd486eb6dc3d08011b1e5de5243c7fed68a072
parent93b226723942a471d75e98e3424a9cf2929f9544
Merge branch 'MDL-61281_master' of git://github.com/dmonllao/moodle