Merge branch 'MDL-61819-master' of git://github.com/andrewnicols/moodle
commit77d9eca5f2d6141ae6bd05876d36db86dae7b09c
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Apr 2018 14:12:59 +0000 (16 16:12 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Apr 2018 14:12:59 +0000 (16 16:12 +0200)
treeff79a3b5e6574a306a443b4205cef557946375aa
parent99719b6e891e166f26eb81a7e95df98dedb7e569
parent5377f8a263a72baa1778b42ff2ff46eee52b8cea
Merge branch 'MDL-61819-master' of git://github.com/andrewnicols/moodle