Merge branch 'MDL-61832-master' of https://github.com/lucaboesch/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 28 May 2018 01:21:48 +0000 (09:21 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 28 May 2018 01:21:48 +0000 (09:21 +0800)
commit6a7a11a7b320c7999aba30131beb5f4c42b55773
tree5e0f849bca7320eaedf0a48ecf94375f6596849f
parent407f5d053cce1e767c1f65e7814a33a7b2e6c278
parented38521b1d1a514ac894960b41c81696e003e916
Merge branch 'MDL-61832-master' of https://github.com/lucaboesch/moodle