Merge branch 'MDL-60342-master' of https://github.com/patkira/moodle
commitdf4095ca6cdd9e93f55d75284752ec891e14e4e7
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 19 Oct 2017 21:23:49 +0000 (19 23:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 19 Oct 2017 21:23:49 +0000 (19 23:23 +0200)
tree785f1a527a0ff5f01a9e13f10a8797e08df76052
parentc1321a9a0227d91bf2ecc814c170f4e9f6bbc4dc
parent5a97f26be9b21c2dee3b75666acd2dceb060e51f
Merge branch 'MDL-60342-master' of https://github.com/patkira/moodle