Merge branch 'wip-MDL-52100-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 18 Dec 2017 09:07:46 +0000 (10:07 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 18 Dec 2017 09:07:46 +0000 (10:07 +0100)
commitee35376e28816d960576a7dc6a9b299d042ffedb
treef01f14d73cc80f8189927a5bca4bb911937610f9
parentb91696eeac0e9ae6f9e101d6344609b8bb5e640b
parentc86189ae02e0619bc6c1b4d39f6e52684b48f6e5
Merge branch 'wip-MDL-52100-master' of git://github.com/abgreeve/moodle