Merge branch 'MDL-62897-master' of git://github.com/rezaies/moodle
commit5ecca25603bf3168496c5d4316c03b06f9ec7aa1
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 25 Jul 2018 04:42:31 +0000 (25 12:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 25 Jul 2018 04:42:31 +0000 (25 12:42 +0800)
tree236b1f1e774420a82108e0506f14845e09b11863
parent834054ee06dfb1629359d1e895483abf626abc5d
parent3f0a60e33dd15243fb818fcb95352e7dff44d03e
Merge branch 'MDL-62897-master' of git://github.com/rezaies/moodle