Merge branch 'MDL-63234-master' of git://github.com/andrewnicols/moodle
commit39d5bf09ebe748cf17993535bd8a3eb4fae4f1b0
authorDavid Monllao <davidm@moodle.com>
Mon, 27 Aug 2018 09:32:09 +0000 (27 11:32 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 27 Aug 2018 09:32:09 +0000 (27 11:32 +0200)
treed278bc4a7129b6494ae77cec537462c6fef20107
parent12f767820a984a34a418a0c2a39de668f3d53c40
parent1a5a0b9b5f2819bde3be124aec359814ff15ff22
Merge branch 'MDL-63234-master' of git://github.com/andrewnicols/moodle