Merge branch 'MDL-61514-master' of git://github.com/rezaies/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 22 Mar 2018 02:52:53 +0000 (10:52 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 22 Mar 2018 02:52:53 +0000 (10:52 +0800)
commitedf88a3bb35841c9101f106be02a77ae96675a42
treef0018a97119e375c1ec69b9fa2cabe69482d6a1a
parent820a91def36811f87eae3ba22d3d773708895850
parent3b5ae9777d2d0a0e90aaacb1a7d1b21da39ddba5
Merge branch 'MDL-61514-master' of git://github.com/rezaies/moodle