Merge branch 'MDL-43334-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Aug 2018 22:11:16 +0000 (00:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Aug 2018 22:11:16 +0000 (00:11 +0200)
commit6760a7e3e994f8d845f313b5fd7bfe6868219e20
treecc5fdb358e766aa6dd377c65ce244ebdd65c778b
parent43ae41a10075a66c32d6595e92093237c8c7b846
parent6fea9dc4b386058b235a758232ff7e9bcefc7307
Merge branch 'MDL-43334-master' of git://github.com/damyon/moodle