Merge branch 'MDL-61169-master' of git://github.com/andrewnicols/moodle
commit22a9fed6b2dff4bbbdc082a13a2f5f6b1a61d3d2
authorDavid Monllao <davidm@moodle.com>
Mon, 8 Jan 2018 13:58:31 +0000 (8 14:58 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 8 Jan 2018 13:58:31 +0000 (8 14:58 +0100)
treec93e972351279775014f54926168ce66ac07f60a
parent7110a3eed6954a401a927b3e0fa80d74f2889db1
parent2cf6b060cdb13032c17fbeac1fea5e32b96911d7
Merge branch 'MDL-61169-master' of git://github.com/andrewnicols/moodle