Merge branch 'MDL-62117-master' of git://github.com/rezaies/moodle
commit820c23493465428a05594768e0762e0f3f1a04b7
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 May 2018 02:19:30 +0000 (9 10:19 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:15:54 +0000 (10 09:15 +0800)
treebc142e7a4de0f93486d02ba52cc99001bc8a906e
parent5b98200ff42f89e5baada075acd6a8045d1f8566
parent31fd863bd93b9883832a565fec730c8312dce202
Merge branch 'MDL-62117-master' of git://github.com/rezaies/moodle