Merge branch 'MDL-59299-master' of https://github.com/xow/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 1 Aug 2017 02:56:09 +0000 (04:56 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 1 Aug 2017 02:56:09 +0000 (04:56 +0200)
commit85a9c0b1e51927707bc79c2cafb8fc2e626139ba
tree0b543fa85fe4af01edde6610daf05f6683f8bff6
parent5283fa3329a5725ee4a81fc5b83f3ef955642b26
parent1318aec36e5d63b6c7da8eccd6d1516829c9d896
Merge branch 'MDL-59299-master' of https://github.com/xow/moodle