Merge branch 'MDL-61375_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 12 Feb 2018 08:40:31 +0000 (09:40 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 12 Feb 2018 08:40:31 +0000 (09:40 +0100)
commit0abe3fe3738522c5b645d9fd8b9dcbdaa82c1008
treede2050d5fe9b9dced946456afe74e0e57d1ee4fe
parent755310cbebb65618df2c862a84ca63398e01b3a5
parentfb77b89fd896eddafb7510cb2a5d1030346e986a
Merge branch 'MDL-61375_master' of git://github.com/markn86/moodle