Merge branch 'MDL-58845-master' of https://github.com/lucaboesch/moodle
commit25e0557484f7bb92167e1c2f0a1fc3b951d5ed8e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Feb 2018 01:12:30 +0000 (19 02:12 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Feb 2018 01:12:30 +0000 (19 02:12 +0100)
treee7edbde047167a003d9c892d2dac0cb9e8ad8cfd
parent98ee3df14e51130c7f7a905eab9ea8634a93bbd2
parent3a9f0ad138f3d7183b64a8e8c7b6e7ddc3067daa
Merge branch 'MDL-58845-master' of https://github.com/lucaboesch/moodle