Merge branch 'MDL-39035-master' of https://github.com/lucaboesch/moodle
commit99719b6e891e166f26eb81a7e95df98dedb7e569
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Apr 2018 10:57:34 +0000 (16 12:57 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Apr 2018 10:57:34 +0000 (16 12:57 +0200)
tree3e4f0d8856ccaf9ca39e62e8a54e5b636ffd645b
parent82f0ddc7c7e7c0b562778120d319b7b6a49675e1
parentc3c8cc40bea641f27afa7b9fcd66c3b9f9065c56
Merge branch 'MDL-39035-master' of https://github.com/lucaboesch/moodle