Merge branch 'MDL-61576-master' of git://github.com/cescobedo/moodle
commita8336b03a0398278e56e757716ec0d5b740dcd5e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Mar 2018 21:19:55 +0000 (26 23:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2018 16:12:48 +0000 (28 18:12 +0200)
tree6a93cd6dedff6dd52e1909a49d0c5557865786f8
parent0b9162bd0594e9e57bffe0173dd7ce569b9af07c
parentadbf7c5a43d4913ebd937effe9f2311548784bd7
Merge branch 'MDL-61576-master' of git://github.com/cescobedo/moodle