Merge branch 'MDL-61852-master' of git://github.com/bmbrands/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 12 Apr 2018 05:14:03 +0000 (13:14 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 12 Apr 2018 05:14:03 +0000 (13:14 +0800)
commit05dfaab2b45566e87944f64f64fb1861261dbbf8
tree599b55e8f0b5b70dd2afd5844bc0706de9c7d45a
parent934b1e98321188ea2eeb7682b866fce65b07020e
parentfd70f25519ae5e79b7816c839e8eede723ce3484
Merge branch 'MDL-61852-master' of git://github.com/bmbrands/moodle