Merge branch 'MDL-62180-master' of https://github.com/lucaboesch/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 9 Jul 2018 07:46:25 +0000 (15:46 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 9 Jul 2018 07:46:25 +0000 (15:46 +0800)
commit31431602045ee66f038d6660234c2e138904a336
treec5b0ae78d56d8c0dd48f76499db148ffc0b88a4c
parent8dfafebc13ad2c73a046a6e602d742d0eea7fa4c
parenta494830c28edc7578c469dd8eddb1f26dbe7d433
Merge branch 'MDL-62180-master' of https://github.com/lucaboesch/moodle