Merge branch 'MDL-61309-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 10 May 2018 06:46:32 +0000 (08:46 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 10 May 2018 06:46:32 +0000 (08:46 +0200)
commit782b242ccb2be565e88ff7445c0a9538eca200ea
treef640fa273d39c4191ca0d79f2be9e4cc8a4d1210
parent4a70fd99737ad4cfdb7a98bc8befc1b8a5580032
parentf66208297480cfd6a112fa629bae3f6003d13158
Merge branch 'MDL-61309-master' of git://github.com/andrewnicols/moodle