Merge branch 'MDL-63832-master' of git://github.com/jleyva/moodle
commitb51b0c668256a669d447a2a0c04658111489cd3e
authorJun Pataleta <jun@moodle.com>
Thu, 15 Nov 2018 15:12:14 +0000 (15 23:12 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 15 Nov 2018 15:12:14 +0000 (15 23:12 +0800)
treeb55a146e2d99f0ffc5d2ece281e4c32b7565d933
parent9ca803a86d0eacfdb25e6ec63ed531cae22b1890
parentdf3d877656b355e160980d373cec7bdbd69adaa4
Merge branch 'MDL-63832-master' of git://github.com/jleyva/moodle