Merge branch 'master' of https://github.com/janeklb/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Jan 2016 07:57:36 +0000 (15:57 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 09:31:09 +0000 (09:31 +0000)
1  2 
Gruntfile.js

diff --cc Gruntfile.js
Simple merge