Merge branch 'MDL-63740-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 7 Nov 2018 11:56:10 +0000 (12:56 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 7 Nov 2018 11:56:10 +0000 (12:56 +0100)
commitd33a22c037b251621629a9015ba402b3de69eb05
tree59d7f00089a3b352d0c85ca565ac151372f8c676
parent3c577cb583d96b0c1a9040e3d8da6fba69cd59e9
parentb9508423b40cfd01c2bbb0afc0247c0ff50d95d4
Merge branch 'MDL-63740-master' of git://github.com/jleyva/moodle