diff options
| author | Mark Otto <[email protected]> | 2013-12-21 11:17:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-21 11:17:29 -0800 |
| commit | 02c40ab9919ee87ec8f7688133cc71f64f460013 (patch) | |
| tree | 350491788234da822d8fc9dfcaf6c31b7599cdcc /package.json | |
| parent | 07705673b6398ae9cfe2cb59b97d61e04efeb8bf (diff) | |
| parent | 5f9695ae7cf66dd7f07a3cb3eb534e838d18c62b (diff) | |
| download | bootstrap-02c40ab9919ee87ec8f7688133cc71f64f460013.tar.xz bootstrap-02c40ab9919ee87ec8f7688133cc71f64f460013.zip | |
Merge branch 'master' into docs_derp
Conflicts:
_layouts/default.html
components.html
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package.json b/package.json index dbb921a66..882025622 100644 --- a/package.json +++ b/package.json @@ -7,11 +7,11 @@ "author": "Twitter, Inc.", "scripts": { "test": "grunt test" }, "repository": { - "type": "git" - , "url": "https://github.com/twbs/bootstrap.git" + "type": "git", + "url": "https://github.com/twbs/bootstrap.git" }, "bugs": { - "url": "https://github.com/twbs/bootstrap/issues" + "url": "https://github.com/twbs/bootstrap/issues" }, "licenses": [ { @@ -33,7 +33,7 @@ "grunt-contrib-qunit": "~0.3.0", "grunt-contrib-uglify": "~0.2.4", "grunt-contrib-watch": "~0.5.3", - "grunt-csscomb": "~1.1.0", + "grunt-csscomb": "~1.2.1", "grunt-html-validation": "~0.1.11", "grunt-jekyll": "~0.4.0", "grunt-jscs-checker": "~0.2.5", |