Merge branch 'MDL-60430-master' of https://github.com/mihailges/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 26 Oct 2017 08:27:34 +0000 (10:27 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 26 Oct 2017 08:27:34 +0000 (10:27 +0200)
commit7ec04e0e09dbdd35c67691f05cad2a2733957a8e
tree8a18e62b1e3223b07ceb1c8efbed06c05a95f1a0
parent1fc642324a67d8b8e18623c6de5a488bff1532de
parent6a633d36c2e307da2b5d068b6794a64b6ea7f61e
Merge branch 'MDL-60430-master' of https://github.com/mihailges/moodle