Merge branch 'MDL-31443-master' of https://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jun 2018 23:35:19 +0000 (01:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jun 2018 23:35:19 +0000 (01:35 +0200)
commit3afd0a252337d14eafa33fdd006a1fdf24e28534
tree0ba8ca9c354a94695d15b4837086795ffd9e975d
parentd157f8774e4239f3713a8f62e81cb125ad6a330d
parentf55b45e473210727e1ddd83e2714e58e99f76c67
Merge branch 'MDL-31443-master' of https://github.com/lucaboesch/moodle