Merge branch 'MDL-60181-master' of git://github.com/mihailges/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 11:30:44 +0000 (12:30 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 11:30:44 +0000 (12:30 +0100)
commit863d7ca5aa7c9ee12a9c583ca43be173d7b4f584
treebf2ea15bffd3fd5978afee6f4dd01ad338861efa
parent6092574ddf9374a870c873bd2f6315b56f5a48fb
parent11342dbcf8afa985123a512e8d6b8eb381307721
Merge branch 'MDL-60181-master' of git://github.com/mihailges/moodle