Merge branch 'MDL-59931_master' of https://github.com/ctam/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Sep 2017 23:16:10 +0000 (01:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Sep 2017 23:16:10 +0000 (01:16 +0200)
commit4da0f1028628e2a35faaa6bd9d4934b4d438303b
tree0c0c659ee38e64db5d066cf6735a7941d42be103
parent0b4eef24c2c62c0216c6c2b7dd895279f67b8acc
parent43f122d32cde66da83c956b1d22202a002062151
Merge branch 'MDL-59931_master' of https://github.com/ctam/moodle