Merge branch 'MDL-61307-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 14 Mar 2018 01:41:00 +0000 (09:41 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 14 Mar 2018 01:41:00 +0000 (09:41 +0800)
commit4ba1a7a1e6ba63c2e888fc154993b6ef9d73498a
treed66f29878095f4c310fccaaadb1752c8fea3aacc
parentd12cdcbd7d9783b078013e3a2227a8f226aef6e0
parent90cac7c0493163e040a5c7297ad4f0c12ae7539b
Merge branch 'MDL-61307-master' of git://github.com/andrewnicols/moodle