diff options
| author | Mark Otto <[email protected]> | 2013-12-18 16:19:46 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-18 16:19:46 -0800 |
| commit | 07705673b6398ae9cfe2cb59b97d61e04efeb8bf (patch) | |
| tree | 4f105edd66b0c13a8a99a636b4aef0bb640b883d /Gruntfile.js | |
| parent | bc265ac64798c01b2f35ca48ef1a65025e0c71b5 (diff) | |
| parent | 3315d4d9f4c47e67f1d1c9f6a0b262a5d8b688bd (diff) | |
| download | bootstrap-07705673b6398ae9cfe2cb59b97d61e04efeb8bf.tar.xz bootstrap-07705673b6398ae9cfe2cb59b97d61e04efeb8bf.zip | |
Merge branch 'master' into docs_derp
Conflicts:
_layouts/default.html
Diffstat (limited to 'Gruntfile.js')
| -rw-r--r-- | Gruntfile.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index ab4b56cd2..d2b371ed7 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -18,7 +18,7 @@ module.exports = function (grunt) { banner: '/*!\n' + ' * Bootstrap v<%= pkg.version %> (<%= pkg.homepage %>)\n' + ' * Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' + - ' * Licensed under <%= _.pluck(pkg.licenses, "url").join(", ") %>\n' + + ' * Licensed under MIT (<%= _.pluck(pkg.licenses, "url").join(", ") %>)\n' + ' */\n\n', jqueryCheck: 'if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") }\n\n', |