Merge branch 'MDL-61194-master' of git://git.cameron1729.xyz/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 3 May 2018 09:07:57 +0000 (17:07 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 3 May 2018 09:07:57 +0000 (17:07 +0800)
commitc166b700d8033136d6f34a20159f73bb17838c3f
treec113c9bd2038b83e3521f4f8f27a79aff5d9f060
parent3128529784bed259a954ff0afeed31dc74811e74
parent23fe1e2bed5ed41eb4891de8e4171c7b66be4a88
Merge branch 'MDL-61194-master' of git://git.cameron1729.xyz/moodle