Merge branch 'MDL-61380-master' of git://github.com/rezaies/moodle
commit475d4345f99a3ccf0027b4cd8ee0f21ff45b22cd
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Mar 2018 01:00:15 +0000 (7 09:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Mar 2018 01:00:15 +0000 (7 09:00 +0800)
tree2639899f2a7ee1a3446fdb2052858be829fead54
parent647db53d1493d403d1ead8506011306a1c5a57b9
parent81053f8cbebb5ef1e0bd01c2b73c419c2e658f37
Merge branch 'MDL-61380-master' of git://github.com/rezaies/moodle