diff options
| author | Mark Otto <[email protected]> | 2013-09-11 12:31:21 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-09-11 12:31:21 -0700 |
| commit | 37933a9e08e24e0683c3909aaabe79888e006ba6 (patch) | |
| tree | dcd0cbb40240b1e0a5b856ce8755fbcd9a6b9f10 /package.json | |
| parent | 5d1707a25c0ee68644a182196439a86be1beafbd (diff) | |
| parent | c62426daeb8e7709422ab2eeeb0cf2eb2fad4575 (diff) | |
| download | bootstrap-37933a9e08e24e0683c3909aaabe79888e006ba6.tar.xz bootstrap-37933a9e08e24e0683c3909aaabe79888e006ba6.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json index af3c00a14..1863251b6 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ , "version": "3.0.0" , "keywords": ["bootstrap", "css"] , "homepage": "http://twbs.github.com/bootstrap/" - , "author": "Twitter Inc." + , "author": "Twitter, Inc." , "scripts": { "test": "grunt test" } , "repository": { "type": "git" |