Merge branch 'MDL-56498-master' of git://github.com/mickhawkins/moodle
commitf9be03432a2d8031cbd5c7c94b1743167998ba36
authorJun Pataleta <jun@moodle.com>
Tue, 29 May 2018 01:37:16 +0000 (29 09:37 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 29 May 2018 01:37:16 +0000 (29 09:37 +0800)
treefcc77a1e8a533456504c246d37f3eb49f31c1d3c
parent77e7c45487f4716a68fb1dc290ae140ea2a3afb4
parent105974cd088dc5e00cecc748803fcb8f982863b8
Merge branch 'MDL-56498-master' of git://github.com/mickhawkins/moodle