Merge branch 'MDL-61364-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 28 Mar 2018 01:18:24 +0000 (09:18 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2018 16:16:37 +0000 (18:16 +0200)
commitbddf012b7c234d29d2dda9f12d041765e6cedc4f
tree28d1d5170da5119fb58c582bc2532464a0d6fcd8
parent5a8d683fb2403876e0b22b89ad7636f1ee8cdc4f
parent15cd009097f791ba6533ca0f4427a25c2a76aae9
Merge branch 'MDL-61364-master' of git://github.com/lameze/moodle