Merge branch 'MDL-60439-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 26 Dec 2017 09:17:40 +0000 (10:17 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 27 Dec 2017 16:54:55 +0000 (17:54 +0100)
commit6e02b56f2ac2d6848f4bdeed5493e1766b56fa30
treebaecd07da1d079a846c2d3299622ec88de8df729
parent7b546cdb837054466c018a7441aa05f000d76205
parent59d3deb9c036471bb7d7aed5859e3608411141f3
Merge branch 'MDL-60439-master' of https://github.com/lucaboesch/moodle