Merge branch 'MDL-59774_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Aug 2017 09:58:00 +0000 (11:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Aug 2017 09:58:00 +0000 (11:58 +0200)
commit104ae3efdf5970c6e851143e6e9f7d986e705a1f
tree67e43377d0e96325a3e608fa0d92deda2c47efe8
parent993ccc7268a38c250353a35b3bd4baa27ebb00f0
parent88777c570c03816f57b65303379894dc7c0322ea
Merge branch 'MDL-59774_master' of git://github.com/dmonllao/moodle