diff options
| author | Mark Otto <[email protected]> | 2013-12-07 11:41:02 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-07 11:41:02 -0800 |
| commit | cc1f95652bbf5c7d7ab5b040cdc15478d68e0369 (patch) | |
| tree | 2b0c31076784e3d74e4e9d05b62916a696e1b959 /bower.json | |
| parent | 775c29fef6d87dd91ebc6dba5980f3b59976b435 (diff) | |
| parent | 94a5413ec7fb90c1340f1243869274c36d308cb0 (diff) | |
| download | bootstrap-cc1f95652bbf5c7d7ab5b040cdc15478d68e0369.tar.xz bootstrap-cc1f95652bbf5c7d7ab5b040cdc15478d68e0369.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'bower.json')
| -rw-r--r-- | bower.json | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bower.json b/bower.json index 02bd14c6d..82cf69b63 100644 --- a/bower.json +++ b/bower.json @@ -2,8 +2,8 @@ "name": "bootstrap", "version": "3.0.3", "main": [ - "./dist/js/bootstrap.js", - "./dist/css/bootstrap.css", + "./dist/js/bootstrap.js", + "./dist/css/bootstrap.css", "./dist/fonts/glyphicons-halflings-regular.eot", "./dist/fonts/glyphicons-halflings-regular.svg", "./dist/fonts/glyphicons-halflings-regular.ttf", @@ -19,7 +19,6 @@ "CNAME", "CONTRIBUTING.md", "Gruntfile.js", - "browserstack.json", "composer.json", "package.json", "*.html" |