Merge branch 'MDL-61571-master' of git://github.com/andrewnicols/moodle
commit7394da46e22357e3f371aeca8f90d6419d4533aa
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 15 Mar 2018 22:48:24 +0000 (15 23:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 15 Mar 2018 22:48:24 +0000 (15 23:48 +0100)
tree68e6da2c9b8460b731d08c0650d847c01e66b4d7
parente1a527c0d4bb69a220f18877d652d9e9d9790814
parent0d7ab3f6924a12a1b570bd61037bcf42650cbb5c
Merge branch 'MDL-61571-master' of git://github.com/andrewnicols/moodle