Merge branch 'MDL-64283-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 6 Dec 2018 06:58:01 +0000 (14:58 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 6 Dec 2018 06:58:01 +0000 (14:58 +0800)
commit5fd1f89004af0631e03589825a0f0eae2ed15f72
tree56b1f9fc29134642e4f6974f32b47ecb03756138
parentc7bd047d244985f3f7c02f1d4fc262a2219f575a
parentafd5c94dbf15588e5592b61a5818d5f93f522e9b
Merge branch 'MDL-64283-master' of git://github.com/damyon/moodle