Merge branch 'MDL-61733-master' of https://github.com/MartinGauk/moodle
commit56f5e21f6e8ff97c94939b6a63b071d6ab68714b
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 26 Mar 2018 07:01:44 +0000 (26 15:01 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2018 16:12:39 +0000 (28 18:12 +0200)
tree5eeca345ef89a8dd37eec5cfe89c093e0001345d
parent0b4e4ca48f3c975c64c280fa831c9e0113b62f89
parentdb3da830c1a7004d44408ea477df81704e6d66f2
Merge branch 'MDL-61733-master' of https://github.com/MartinGauk/moodle