diff options
| author | Mark Otto <[email protected]> | 2013-12-22 22:31:28 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-22 22:31:28 -0800 |
| commit | 6fda30e1c4532f639ae3cfe3921ea6cfb143e11b (patch) | |
| tree | 7993782818caaaae63cf15da5ea402083fb6b029 /bower.json | |
| parent | 9fc0e20381ec06bc85c68a5e6f1f2a5103a3267a (diff) | |
| parent | 45a8a9508ed8c2cced5e8ce0b21ef3fd11fe6e15 (diff) | |
| download | bootstrap-6fda30e1c4532f639ae3cfe3921ea6cfb143e11b.tar.xz bootstrap-6fda30e1c4532f639ae3cfe3921ea6cfb143e11b.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'bower.json')
| -rw-r--r-- | bower.json | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bower.json b/bower.json index 63616ee39..b29c2702b 100644 --- a/bower.json +++ b/bower.json @@ -2,8 +2,8 @@ "name": "bootstrap", "version": "3.1.0", "main": [ - "./dist/js/bootstrap.js", "./dist/css/bootstrap.css", + "./dist/js/bootstrap.js", "./dist/fonts/glyphicons-halflings-regular.eot", "./dist/fonts/glyphicons-halflings-regular.svg", "./dist/fonts/glyphicons-halflings-regular.ttf", @@ -11,14 +11,14 @@ ], "ignore": [ "**/.*", + "*.html", "_*", - "docs-assets", - "examples", - "js/tests", "CNAME", - "CONTRIBUTING.md", "composer.json", - "*.html" + "CONTRIBUTING.md", + "docs-assets", + "examples", + "js/tests" ], "dependencies": { "jquery": ">= 1.9.0" |