Merge branch 'MDL-60182_master' of https://github.com/nadavkav/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 19 Oct 2017 11:29:52 +0000 (13:29 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 19 Oct 2017 11:29:52 +0000 (13:29 +0200)
commit254c19e26f78987a5d078422ab82e582a5f0bd23
treea10d7ad5eb3778c34a01b49767302fab129e12ac
parentb469834ac9029d00a509537de91d442c221a17a9
parentad4cba91a4f65dab239d6576adeaf5e4e65a4222
Merge branch 'MDL-60182_master' of https://github.com/nadavkav/moodle