Merge branch 'MDL-64425-36' of git://github.com/lameze/moodle into MOODLE_36_STABLE
commit6a6d78107c60e7b7626fda49dc15329ddf342bf4
authorSara Arjona <sara@moodle.com>
Tue, 15 Jan 2019 12:21:05 +0000 (15 13:21 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 15 Jan 2019 12:21:05 +0000 (15 13:21 +0100)
tree0e46254fb0bbf4835411d2ecf02571d3b90cd2a5
parent49447986267401a596929b1135161f23cf44d124
parent6f76116cd2f183fd01ec73d7f4147855512b4af8
Merge branch 'MDL-64425-36' of git://github.com/lameze/moodle into MOODLE_36_STABLE