Merge branch 'MDL-59656_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 7 Aug 2017 07:26:03 +0000 (09:26 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 7 Aug 2017 07:26:03 +0000 (09:26 +0200)
commit21e68c5ff1b9310de394433fe84db0fff869560d
treeb16092e5d4e74ba72ea31042d3bbb81e507fc791
parent037093107689cf32424470f308dd888f47b0b024
parent3cf76bbc87d6f50a801d9ad878324bd77f913e2a
Merge branch 'MDL-59656_master' of git://github.com/markn86/moodle