Merge branch 'MDL-63026_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Aug 2018 13:59:51 +0000 (15:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Aug 2018 13:59:51 +0000 (15:59 +0200)
commit937a608d711412f48056ad17a0a0d6c4f2dc8913
tree578056b12de40b987ea1cfa5ff27b81927720340
parentc8bea6ae5722688160b875a603ebe2d6da99a5f2
parent7afa724cb5dccef0fbd32e13a68244ead25c8d77
Merge branch 'MDL-63026_master' of git://github.com/dmonllao/moodle