Merge branch 'wip-MDL-59311-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 31 Jul 2017 12:45:35 +0000 (14:45 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 31 Jul 2017 12:45:35 +0000 (14:45 +0200)
commitf82e86e9f7c5a600dfe6cea776cb5429ab49abdd
tree2bfecf49e43ec45d729c6ec0aefb920bf9b3aa4f
parent56b3a0a4772885eb5ed0091b59557214498adcc4
parent8120795233f8b68e7c39bf469e94a41d3dbe5213
Merge branch 'wip-MDL-59311-master' of git://github.com/marinaglancy/moodle