Merge branch 'MDL-49651-master' of git://github.com/Chocolate-lightning/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 3 Jan 2019 02:45:07 +0000 (10:45 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 3 Jan 2019 02:45:07 +0000 (10:45 +0800)
commit87bf7fa912e6a380d052b0dcc1656f1d8ebc3610
tree675c8c01fc98f01f53fd6e2ebfcfec29a9e665e3
parent38a1b4f203c706a3b374d343270ba9202cc17d93
parent299dc536aaffa28c10b781c213d176f132f79716
Merge branch 'MDL-49651-master' of git://github.com/Chocolate-lightning/moodle