Merge branch 'MDL-60301-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Oct 2017 22:37:11 +0000 (00:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Oct 2017 22:37:11 +0000 (00:37 +0200)
commitae2ae5f46f1dafa5df8466ec9e99ccf5a1a55199
tree1c93d08337ffc53a522731a5f1e3f79d3e858ec1
parenta9d3910d709c9bf18cf982bcf65b2880bfbe558f
parentd041a0b71fde5784bfd8ade3d388251cf1d53715
Merge branch 'MDL-60301-master' of git://github.com/ankitagarwal/moodle