Merge branch 'MDL-62069-master' of git://github.com/bmbrands/moodle
commit7dc966479c62450a6ce8b99c6e109053ce69bfc7
authorDavid Monllao <davidm@moodle.com>
Thu, 26 Apr 2018 13:49:26 +0000 (26 15:49 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 26 Apr 2018 13:49:26 +0000 (26 15:49 +0200)
tree3f8c1d008123f2cccdb38fa815168ddf66425e8b
parent258bf5c4e846d4f26b49c66cc922929d69a1302c
parent716b5ffa0905eaa846457abbb91b0ac25e1dea8e
Merge branch 'MDL-62069-master' of git://github.com/bmbrands/moodle