Merge branch 'MDL-57244-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Aug 2018 22:24:14 +0000 (00:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Aug 2018 22:24:14 +0000 (00:24 +0200)
commit20c7822f6d27287344df4bb8f3ccde42aacee912
treec8900139d5794800982ff6679c420156cb2a9a6d
parentc965349aadcb47f0b8cdb9871e4ad42f39507ca9
parent3714fe7e6ec611ed2a8756ca867233e8d4b97af0
Merge branch 'MDL-57244-master' of git://github.com/abgreeve/moodle