Merge branch 'MDL-61211-master' of git://github.com/mihailges/moodle
commit9655ef534d7be637c9a72f480fe77f5af09e6a3f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Mar 2018 22:30:19 +0000 (5 23:30 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Mar 2018 22:30:19 +0000 (5 23:30 +0100)
treed8ffc2ac2e95f19e321579884ec8e2d76bf9ef88
parent6d3f2f9036b0ad0de7594c844871869b4ea2e3a7
parent0e613a1f5b0f360aaa31ac16e58095361dce7ac1
Merge branch 'MDL-61211-master' of git://github.com/mihailges/moodle