Merge branch 'MDL-61364-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 28 Mar 2018 03:41:36 +0000 (11:41 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2018 16:16:40 +0000 (18:16 +0200)
commite8b3c3e17821e700e9248811f2c58f21b47228a8
treeff699ddb2c6d111b3fad2344dd2fcfca6ef3386a
parentbddf012b7c234d29d2dda9f12d041765e6cedc4f
parent02b1868c32ca0451cf7516fe798ea424bf6f4ca6
Merge branch 'MDL-61364-master' of git://github.com/lameze/moodle