Merge branch 'wip-MDL-46495-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 10 Jul 2017 12:15:21 +0000 (13:15 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Jul 2017 12:15:21 +0000 (13:15 +0100)
commitf04b6af7d7b0d0edfe7538d274c92e0bfc4d55bf
tree622a2d6d421f20c163cfb59ac50243ec51e2b0c4
parent6248b5ba6303f7d371ff652a9d69237318c043b8
parentef5fdb3709ceaafd977283f6a0ce7ff8424e6e0c
Merge branch 'wip-MDL-46495-master' of git://github.com/marinaglancy/moodle