Merge branch 'MDL-61497-master' of https://github.com/lucaboesch/moodle
commit976ba87888b8169dd24c0fbc819129cb6742a364
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Mar 2018 01:58:29 +0000 (7 09:58 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Mar 2018 01:58:29 +0000 (7 09:58 +0800)
tree6239767bd98cb596874beda40019e57e702e74b0
parent98aaa343f1b447c3b4c0891dfb81016fd797d28a
parent49ccb165cc25dc492493c10e27fe97b8cd4413ff
Merge branch 'MDL-61497-master' of https://github.com/lucaboesch/moodle