Merge branch 'MDL-62224_master' of git://github.com/markn86/moodle
commite2afdc9c215f843d20fee9ad93e3d1ade7813211
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 15:38:14 +0000 (26 17:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 15:38:14 +0000 (26 17:38 +0200)
tree2483b9829be5a648cdf0e23e518ce590ba7554bd
parent7dc966479c62450a6ce8b99c6e109053ce69bfc7
parent97fcf562baa7955c8e2d2d361d6ed009f9fceede
Merge branch 'MDL-62224_master' of git://github.com/markn86/moodle