Merge branch 'MDL-61875-34' of https://github.com/snake/moodle into MOODLE_34_STABLE
commit70348aa81e5a081785b1c64c8beb8be618b914ab
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Apr 2018 11:06:30 +0000 (10 13:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Apr 2018 11:06:30 +0000 (10 13:06 +0200)
tree63a5b9e6dc68da1b008185a382ed448a3bf5ec25
parent5f1145b4cee6f91eac8982a703b90acb7528cd3e
parentedadfa06cbf2d45a1f7dd80b427771d50d930abb
Merge branch 'MDL-61875-34' of https://github.com/snake/moodle into MOODLE_34_STABLE