Merge branch 'MDL-57666-master' of git://github.com/mihailges/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Aug 2018 23:27:41 +0000 (01:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Aug 2018 23:27:41 +0000 (01:27 +0200)
commitd8971be88f865404b0b14db08253d8c067625eba
tree50636c3abda07be59a0a8a7ea489c0b3dfeef4bd
parentbac049773ff0ead3268dac203d6e4ecda5695502
parentb4d50808925974ca6714ee5cc174b66f63ecf9bd
Merge branch 'MDL-57666-master' of git://github.com/mihailges/moodle