Merge branch 'MDL-60814_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jan 2018 00:24:46 +0000 (01:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jan 2018 00:24:46 +0000 (01:24 +0100)
commitdd2e263752583c28ca9dfe959e07fcd47edd47dc
treea54b321eaa0a6c19d578b3ac05f4844c9b03a5d7
parent4a87646654c938f8a8cd10203b99c323c6ebe379
parent822fe4fc155af73b407c5d23b905be1470995d3b
Merge branch 'MDL-60814_master' of git://github.com/markn86/moodle