Merge branch 'MDL-35788-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 4 Oct 2018 04:45:09 +0000 (12:45 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 4 Oct 2018 04:45:09 +0000 (12:45 +0800)
commit6cd50cb215012b8a8d08cd31995df82300bff51a
treed527ba8af232b98913ef2c86ffd0abd8e1b7e29c
parent86abaf31c8c0fac00376bacd6f772120e8e59675
parent94df729b92acdb4d62b06f658d5c43e5c40915ad
Merge branch 'MDL-35788-master' of git://github.com/andrewnicols/moodle