aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-19 00:03:35 -0700
committerMark Otto <[email protected]>2013-08-19 00:03:35 -0700
commit0730c22e2152c69b0cfde1c98566c3164fadcf3e (patch)
tree14acade5744e230a0bf6fb82bbdd2fa6813bdf04
parentc77bae308a689f6c38e0adec8acabd3ed4704e6a (diff)
parentc6a1a493c7418677a921d38f5c9b2064aed1a5ee (diff)
downloadbootstrap-0730c22e2152c69b0cfde1c98566c3164fadcf3e.tar.xz
bootstrap-0730c22e2152c69b0cfde1c98566c3164fadcf3e.zip
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
-rw-r--r--Gruntfile.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index e05763f1c..79f5715d8 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -127,7 +127,7 @@ module.exports = function(grunt) {
validation: {
options: {
- reset: true,
+ reset: true
},
files: {
src: ["_gh_pages/**/*.html"]