Merge branch 'wip-MDL-61786-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 17:14:43 +0000 (19:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 17:14:43 +0000 (19:14 +0200)
commit77eee742f013060e8a033948f550b347bd7bd8bb
treed86416a3a7ac32849ef8565009ac8d1c45ff5bad
parentcb461375a8915f5a531d759a91835ee314bf072f
parent6bdccc7438f4f2369fb02fd1a469dbe56b904522
Merge branch 'wip-MDL-61786-master' of git://github.com/abgreeve/moodle