Merge branch 'MDL-62005-master' of git://github.com/rezaies/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 1 May 2018 01:10:18 +0000 (09:10 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 1 May 2018 01:10:18 +0000 (09:10 +0800)
commit15729d9ffab1c3f4783628f44e4c4c4915f8881e
treed89d37c9d333fcf93b64708b82272a6afcd1594a
parent3b1d98ba734e3b9723f64c817c35e97c84b11c63
parent31b76f4f59dce82a2fc8c8119905301465e01ebe
Merge branch 'MDL-62005-master' of git://github.com/rezaies/moodle