Merge branch 'MDL-63394-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 19 Nov 2018 18:42:06 +0000 (19:42 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 19 Nov 2018 18:42:06 +0000 (19:42 +0100)
commit9af8b0aef1c2f560e518bdf948f93e00065e6c86
tree0ca0923358792388e0e6e5f825475251ec4590f4
parent674c00edb20f539c27f1c899f20f4d4566df8bff
parent904c37c6c82d1cf852317c69ae59dccc7a39e097
Merge branch 'MDL-63394-master' of git://github.com/jleyva/moodle