Merge branch 'MDL-63168_master' of git://github.com/markn86/moodle
authorSara Arjona <sara@moodle.com>
Tue, 29 Jan 2019 12:00:47 +0000 (13:00 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 29 Jan 2019 12:00:47 +0000 (13:00 +0100)
commit21a43e550886310d116906013d6918098d666146
tree452d296567e2c5db783dc4f760a00d7dc5b6ad75
parentd067783f2b7b7eb78ba8634ca70317d5940880f6
parent05aa320bd21791c31453f0fe902f5e6c9252794c
Merge branch 'MDL-63168_master' of git://github.com/markn86/moodle