Merge branch 'MDL-63225-34' of git://github.com/jleyva/moodle into MOODLE_34_STABLE
commit33b264e80a9e8a96c8b972ae3f7d69aaf327e19b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Oct 2018 21:26:00 +0000 (10 23:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Oct 2018 21:26:00 +0000 (10 23:26 +0200)
treea3dcb5bf82c8751512900528ded40271211ad5a1
parent447b4bdf5a15c0fd71feea2c77ce5d8312482170
parentd14393fb3ddcdbc256b66f293f30d54804492e89
Merge branch 'MDL-63225-34' of git://github.com/jleyva/moodle into MOODLE_34_STABLE