Merge branch 'MDL-36424-master' of https://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 17:19:59 +0000 (19:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 17:19:59 +0000 (19:19 +0200)
commit61a9f8d147a3a3599274096709400a43167787fc
treeae8e0fc401d23ae8c7303d164c1e4365100307f3
parent77eee742f013060e8a033948f550b347bd7bd8bb
parent1764defb5a1d71691b500faeaae4cebbb1f47b22
Merge branch 'MDL-36424-master' of https://github.com/lucaboesch/moodle