Merge branch 'MDL-57486-master-fix' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 May 2018 05:20:42 +0000 (13:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 May 2018 05:20:42 +0000 (13:20 +0800)
commit5a38bc90a8eaf134d25fd56be1aa4845d2bae9a0
treea0ce09fb9a1fdcf3c122bb4b60b256eaa93be609
parentf77bb2834c39dd935a3f0a1600a88270f7524a0d
parent95c2e43008a1ddd1129a6466e193a4b77e33af47
Merge branch 'MDL-57486-master-fix' of git://github.com/junpataleta/moodle