Merge branch 'master-MDL-59799' of https://github.com/jojoob/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 4 Sep 2017 10:33:02 +0000 (12:33 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 Sep 2017 08:50:14 +0000 (10:50 +0200)
commite8466eee812b7e714067bc85bdb0d921ad2af651
treecaef600aca8a7a628c9ad48589097a826479e6be
parentf48b8613024adfc1cd05b760d9f1bad59f4e20fd
parent1dcd1a071cff14abea017d9e4ac383158b2f3635
Merge branch 'master-MDL-59799' of https://github.com/jojoob/moodle