Merge branch 'MDL-60812-master' of https://github.com/mwehr/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 15:33:07 +0000 (16:33 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 15:33:07 +0000 (16:33 +0100)
commit3c2501ac77d59f2bcf1aa5529a786ae7ff617969
treed8ffd281f6b4642e178bcf15ce335c9998fe15b1
parent863d7ca5aa7c9ee12a9c583ca43be173d7b4f584
parent122c999536ea354353d85bf1889cb90bec2b4198
Merge branch 'MDL-60812-master' of https://github.com/mwehr/moodle