Merge branch 'MDL-61068-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 9 Jan 2018 01:52:47 +0000 (09:52 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 9 Jan 2018 01:52:47 +0000 (09:52 +0800)
commitf9b3597e215acc23e09cd6e5fa38b922447ff43f
tree5b5bb17fe5670fb423a77e491092236e71cb1f86
parentb9e05ae65d3ddd4c5050365ecc6cfd405e0e8076
parent08ac68de3ee991525fe91f2b1188a2209eaa8ea8
Merge branch 'MDL-61068-master' of git://github.com/andrewnicols/moodle