Merge branch 'MDL-62175-master' of git://github.com/jleyva/moodle
commit6fb429dd79e7243b7402cdfbb12f4cbb2932f05a
authorDavid Monllao <davidm@moodle.com>
Wed, 25 Apr 2018 15:37:22 +0000 (25 17:37 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 25 Apr 2018 15:37:22 +0000 (25 17:37 +0200)
tree058ac39702a6624847a0df6a7d77f0da3eecd3d4
parent0d1707f05386611d1596b981dd8cd3ee8d533a0b
parente709853ee6cd068c84c1191e6da65eb32aff885e
Merge branch 'MDL-62175-master' of git://github.com/jleyva/moodle