Merge branch 'MDL-60096-master' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 5 Oct 2017 08:56:46 +0000 (16:56 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 5 Oct 2017 08:56:46 +0000 (16:56 +0800)
commit70041854536566cf3db5ac4b06fef99231c0ba73
tree1ffbc6397bafe9ed943abeb887467024da721ca4
parent736b368920d55c38fcc02a93a175eefa3206ffbd
parent3ea4f446bcad07b345eac81f3bc8d2427d4617ac
Merge branch 'MDL-60096-master' of git://github.com/junpataleta/moodle