Merge branch 'MDL-62217_master' of git://github.com/dmonllao/moodle
commit0f125a45f4bdb590b55886c5cf563338e5624ad9
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 May 2018 10:41:11 +0000 (9 18:41 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:16:01 +0000 (10 09:16 +0800)
treeadf43f9b80a22f7e618530292e54d718589a89c7
parent270cefc4b090081320101d800e24606732eb71ee
parent94522f8dd07c5556a97f5e0fb206618870403cc9
Merge branch 'MDL-62217_master' of git://github.com/dmonllao/moodle