Merge branch 'wip-MDL-61485-master' of git://github.com/marinaglancy/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 27 Feb 2018 01:37:45 +0000 (09:37 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 27 Feb 2018 01:37:45 +0000 (09:37 +0800)
commit54a86d8f1558f5559d0db35f7fe81299025f722a
tree13c48fa76c74daf2475f3e39fcbf189d02f03c5d
parentc99a5e18ebeb7ace66e50dd1050f7effa92747c1
parent4961e964d28f5cdb2c96c9ae5aaa1f05acd8be79
Merge branch 'wip-MDL-61485-master' of git://github.com/marinaglancy/moodle