diff options
| author | Mark Otto <[email protected]> | 2013-12-15 14:10:48 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-15 14:10:48 -0800 |
| commit | 122245fe87bbd293a82ffa6b9c37d8b174b3dc0f (patch) | |
| tree | 35679d94b5787a2ffaf712caa0fab3bf47dd8fa3 /bower.json | |
| parent | 0fcaca86b57bf3a4fa2c8f709e90499c92e0db73 (diff) | |
| parent | 55f6beb4278979155549e17da6e87a2548ec0b88 (diff) | |
| download | bootstrap-122245fe87bbd293a82ffa6b9c37d8b174b3dc0f.tar.xz bootstrap-122245fe87bbd293a82ffa6b9c37d8b174b3dc0f.zip | |
Merge branch 'master' into pr/11676
Conflicts:
less/modals.less
Diffstat (limited to 'bower.json')
| -rw-r--r-- | bower.json | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/bower.json b/bower.json index 02bd14c6d..313ff697f 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", @@ -18,10 +18,7 @@ "js/tests", "CNAME", "CONTRIBUTING.md", - "Gruntfile.js", - "browserstack.json", "composer.json", - "package.json", "*.html" ], "dependencies": { |