Merge branch 'MDL-68323-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Apr 2020 22:47:20 +0000 (00:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Apr 2020 22:47:20 +0000 (00:47 +0200)
1  2 
Gruntfile.js

diff --cc Gruntfile.js
Simple merge