Merge branch 'MDL-64432_master' of git://github.com/gjb2048/moodle
authorSara Arjona <sara@moodle.com>
Tue, 15 Jan 2019 11:57:22 +0000 (12:57 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 15 Jan 2019 11:57:22 +0000 (12:57 +0100)
commitfae8345e3bd7d8af49fccd676c1ba85c4df60d27
tree1b860e180c82e7b8f0beaf274e79297f5bbc547c
parent74a6abc6bbbca2917f1834e986ec54fdf5057848
parentfc9ce45ccaea51dc9898602a541faf23f2d3a352
Merge branch 'MDL-64432_master' of git://github.com/gjb2048/moodle