diff options
| author | Mark Otto <[email protected]> | 2014-07-07 22:10:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-07 22:10:22 -0700 |
| commit | 81b59d35368bc51d361d0352cc92fe99dc580fbf (patch) | |
| tree | 2395d5e79edaaa8c0a7ad82e99931ec895421532 /bower.json | |
| parent | fed2b0f7eb78438eb1b768782b04651881d88740 (diff) | |
| parent | ddee04038f946ac103eb4e70c8eb7adeb2cf563b (diff) | |
| download | bootstrap-81b59d35368bc51d361d0352cc92fe99dc580fbf.tar.xz bootstrap-81b59d35368bc51d361d0352cc92fe99dc580fbf.zip | |
Merge branch 'master' into derp
Conflicts:
docs/_layouts/default.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/docs.min.js
docs/assets/js/src/application.js
Diffstat (limited to 'bower.json')
| -rw-r--r-- | bower.json | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bower.json b/bower.json index 965ed2f1c..24603e6b6 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,7 @@ { "name": "bootstrap", - "version": "3.1.1", + "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", + "version": "3.2.0", "keywords": [ "css", "js", @@ -11,7 +12,9 @@ "framework", "web" ], + "homepage": "http://getbootstrap.com", "main": [ + "less/bootstrap.less", "dist/css/bootstrap.css", "dist/js/bootstrap.js", "dist/fonts/glyphicons-halflings-regular.eot", @@ -20,7 +23,7 @@ "dist/fonts/glyphicons-halflings-regular.woff" ], "ignore": [ - ".*", + "/.*", "_config.yml", "CNAME", "composer.json", |