Merge branch 'MDL-63179-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 27 Aug 2018 10:21:00 +0000 (12:21 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 27 Aug 2018 10:21:00 +0000 (12:21 +0200)
commitc682ea4fd1e9cbd00fbecc628237e7f9c98ebb81
tree311be50ad41d167805a3d2c51d3d3d9a587b4e9b
parent0d9ddf210cee42a34ae16cf2c439746ef4f35050
parent2711941cb993edfc8121ff220aeb6217884d86d4
Merge branch 'MDL-63179-master' of https://github.com/lucaboesch/moodle