Merge branch 'MDL-62075_master' of git://github.com/dmonllao/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 11 May 2018 16:29:56 +0000 (00:29 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 11 May 2018 16:29:56 +0000 (00:29 +0800)
commit9eb19cdf94edcf1822be3a9cbd2c38dd429b1b7a
tree9eed6a4daae524b9fa3c7850a08db6d5af575110
parent4f510bea17e8438f50d2189437af73c98f8dedc6
parenta319808cfb600f0c1ad50ddeaab52fd53ed90583
Merge branch 'MDL-62075_master' of git://github.com/dmonllao/moodle