Merge branch 'MDL-61828-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Apr 2018 22:14:32 +0000 (00:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Apr 2018 22:14:32 +0000 (00:14 +0200)
commitfc9f324fe20dcf9b98b10329d2d6528f244ebed4
treea9574d0f49864c32f2a0493474460f0381f46e4d
parenta845d7d387ca33deb8a4de298f628f0db32b8193
parent5b18ae4a8a9682215f0fe9f8579072b85315402d
Merge branch 'MDL-61828-master' of git://github.com/andrewnicols/moodle