Merge branch 'MDL-36941_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 23 Mar 2018 04:55:49 +0000 (12:55 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 23 Mar 2018 04:55:49 +0000 (12:55 +0800)
commitba926805e2965757914a59ebfe49ffb21260d66a
treecf5f748ec163a7d158dc8ada0c3fdfa8f29fbb2e
parenta15c7459360f220a34c138f808340e3848c85b7c
parent5aac33c785e69bdc51bfc8b3dfa9a24ab775fd2e
Merge branch 'MDL-36941_master' of git://github.com/markn86/moodle