Merge branch 'MDL-60944_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Feb 2019 17:46:44 +0000 (18:46 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Feb 2019 17:46:44 +0000 (18:46 +0100)
commitae5792807b331d700d384c143faf4e5b5659f511
treedfc67999c14cfccaab842d9cc76818a9bf60e4e2
parenta0e20ce87cd5a0517b2d0fd056fbeb8f67a46135
parentc70a7194f41e5d3769355856da17ec091bc311b7
Merge branch 'MDL-60944_master' of git://github.com/dmonllao/moodle