Merge branch 'MDL-63677-35' of git://github.com/sarjona/moodle into MOODLE_35_STABLE
commit021143d5ccd8bfd99677f139789fd712b5c3d328
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jan 2019 22:04:07 +0000 (14 23:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jan 2019 22:04:07 +0000 (14 23:04 +0100)
treee3047f4cc64ae9b061a70bc2664fb5c1c946a66b
parentfcd19e1faf4fa03174f0ee863f27228b3b7affe0
parent38f65afecfcb961577d9fcd7478d4f9d23da413d
Merge branch 'MDL-63677-35' of git://github.com/sarjona/moodle into MOODLE_35_STABLE