Merge branch 'MDL-57727-master' of git://github.com/mihailges/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 2 Jan 2018 11:33:40 +0000 (12:33 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 2 Jan 2018 11:33:40 +0000 (12:33 +0100)
commite3cd0dfc2c6bfd619437493269e9b50b2ec17828
treeccdc275d07650be1434fa616707312ca1d90e44b
parent1588837a9de7f27f4957f740b7f23c967e2249b1
parentb68b5f55ca25f7dd4d2c5e226924a4a3c6fbc52c
Merge branch 'MDL-57727-master' of git://github.com/mihailges/moodle