Merge branch 'MDL-62318-master' of git://github.com/rezaies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 May 2018 03:40:51 +0000 (11:40 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:15:54 +0000 (09:15 +0800)
commitf7ca19afaa22a26f1c996e969a1cfd2ad27233d5
treeddb427f49d8487126ae845b146b76bf04bb25ff1
parent820c23493465428a05594768e0762e0f3f1a04b7
parent5c8735383357a4be16f4f6dcaa8b2c8c2c21fde3
Merge branch 'MDL-62318-master' of git://github.com/rezaies/moodle