Merge branch 'MDL-67953-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Feb 2020 16:09:17 +0000 (17:09 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Feb 2020 16:09:17 +0000 (17:09 +0100)
1  2 
Gruntfile.js

diff --cc Gruntfile.js
Simple merge