Merge branch 'MDL-59279_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Sep 2017 15:56:45 +0000 (16:56 +0100)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 Sep 2017 08:50:17 +0000 (10:50 +0200)
commit83575729b68a46d15e3243a4c974b172f527f9d0
tree6bd79d029b94551e2ccc64496d47281e0fe806c8
parent4cc3f4f08626fd83bc3966c2fe4660a211a56c02
parent10658a1cb4bdecd21ecb418441d3c1d91b77019f
Merge branch 'MDL-59279_master' of git://github.com/dmonllao/moodle