Merge branch 'MDL-35668-master-fix' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 11 Sep 2017 03:34:00 +0000 (11:34 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 11 Sep 2017 03:34:00 +0000 (11:34 +0800)
commitfb1af0797cd999a4d979c1e58c59d04f5a0666e9
treedf85e9918f688d486d316a21ce1865cfb1fd3135
parent4dfc2d19e747c533652d6cca7b0cfcf99dd17ee4
parent68b998906ef1ddafcaed875b84c4baafc03b1299
Merge branch 'MDL-35668-master-fix' of git://github.com/junpataleta/moodle