Merge branch 'MDL-60150' of git://github.com/stronk7/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 16 Oct 2017 06:04:55 +0000 (14:04 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 16 Oct 2017 06:04:55 +0000 (14:04 +0800)
commit274e19dbda8d6a3dc397b1ff76a7b3fc1eb15854
treeda29be9e782c3fbd330e7b3b5df877cded135e2b
parent4b526af5fefab1fa3da46823bdf2ad2feedc93ff
parent1ae99ec3277fff9b4351cf066696fc7920be90d7
Merge branch 'MDL-60150' of git://github.com/stronk7/moodle