aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-20 11:18:04 -0800
committerMark Otto <[email protected]>2013-12-20 11:18:04 -0800
commite1bd300f2f38a32a5baccfcd5dcd83577b7960aa (patch)
tree289fe15c8208b4fb136faed514e7fe2fedbb98fb
parentf1d4a3bb5cb40cb81c18730d4c2ab8ef5b8dc3fe (diff)
parentb604c2fbacc1ffb7843a32f50f322db390766386 (diff)
downloadbootstrap-e1bd300f2f38a32a5baccfcd5dcd83577b7960aa.tar.xz
bootstrap-e1bd300f2f38a32a5baccfcd5dcd83577b7960aa.zip
Merge pull request #11960 from ZDroid/no-leading-commas-json
Drop remaining leading commas
-rw-r--r--composer.json42
-rw-r--r--package.json6
2 files changed, 24 insertions, 24 deletions
diff --git a/composer.json b/composer.json
index 81d7ef85d..93ed9f2df 100644
--- a/composer.json
+++ b/composer.json
@@ -1,25 +1,25 @@
{
- "name": "twbs/bootstrap"
- , "description": "Sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development."
- , "keywords": ["bootstrap", "css"]
- , "homepage": "http://getbootstrap.com"
- , "authors": [
- {
- "name": "Mark Otto",
- "email": "[email protected]"
- },
- {
- "name": "Jacob Thornton",
- "email": "[email protected]"
- }
- ]
- , "support": {
- "issues": "https://github.com/twbs/bootstrap/issues"
+ "name": "twbs/bootstrap",
+ "description": "Sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development.",
+ "keywords": ["bootstrap", "css"],
+ "homepage": "http://getbootstrap.com",
+ "authors": [
+ {
+ "name": "Mark Otto",
+ "email": "[email protected]"
+ },
+ {
+ "name": "Jacob Thornton",
+ "email": "[email protected]"
+ }
+ ],
+ "support": {
+ "issues": "https://github.com/twbs/bootstrap/issues"
+ },
+ "license": "MIT",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.0.x-dev"
}
- , "license": "MIT"
- , "extra": {
- "branch-alias": {
- "dev-master": "3.0.x-dev"
- }
}
}
diff --git a/package.json b/package.json
index b1b7b9000..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": [
{