Merge branch 'MDL-59256_master' of git://github.com/dmonllao/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 7 Nov 2017 08:03:43 +0000 (16:03 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 7 Nov 2017 08:03:43 +0000 (16:03 +0800)
commit5243e93661b51f56a450a63f026c922e3fe1bddd
tree1826afe199a44567e88b2c0c7cfc49d262c595e8
parentb135c42a176a20b73a7f90e1489ba0927be31b04
parentaa30dc88608f6b2f7c036abe1e501f84035df1de
Merge branch 'MDL-59256_master' of git://github.com/dmonllao/moodle