Merge branch 'MDL-62668-master' of git://github.com/jleyva/moodle
authorSara Arjona <sara@moodle.com>
Mon, 28 Jan 2019 18:42:13 +0000 (19:42 +0100)
committerSara Arjona <sara@moodle.com>
Mon, 28 Jan 2019 18:42:13 +0000 (19:42 +0100)
commitc85b7b3a936df43d86a99783e60dc5347da50841
tree8e7b7733923689b0861e5c2a54a19c847ac09eca
parente07bafff8d5ab262ec0d7bfd6d04542cfc0d1a83
parentd8035d939146dc3e0becaa07c8bd327442c6692e
Merge branch 'MDL-62668-master' of git://github.com/jleyva/moodle