Merge branch 'MDL-63435-34' of https://github.com/lucaboesch/moodle into MOODLE_34_STABLE
commit31252432a1f479a20e0c142ca52e437a54977f28
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2018 21:48:27 +0000 (2 23:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2018 21:48:27 +0000 (2 23:48 +0200)
tree7f01f3257340769cd7572f0c343f1abb4498972f
parent75d95d140b9e7c985d99df8638e7abc8f6cb2ea9
parentce3f7aeb1674fb2f7d92346f96305fb9dc75169a
Merge branch 'MDL-63435-34' of https://github.com/lucaboesch/moodle into MOODLE_34_STABLE