diff options
| author | Mark Otto <[email protected]> | 2013-08-13 13:48:33 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-13 13:48:33 -0700 |
| commit | bd93ed2cb6034de2f287f7508b4fd0b1d28ab0d3 (patch) | |
| tree | 2a59b9815cb02226a694c345cf942c9ad869810f /bower.json | |
| parent | 3c772b1cebfed73570247691917b40fcf3d95aa2 (diff) | |
| parent | a8769b8cab1799168b31f1a5afd403f323a6b6d4 (diff) | |
| download | bootstrap-bd93ed2cb6034de2f287f7508b4fd0b1d28ab0d3.tar.xz bootstrap-bd93ed2cb6034de2f287f7508b4fd0b1d28ab0d3.zip | |
Merge branch '3.0.0-wip' into bs3_navbar_overhaul
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'bower.json')
| -rw-r--r-- | bower.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bower.json b/bower.json index 7a3e4b622..a7f3f769a 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "bootstrap", "version": "3.0.0", - "main": ["./dist/js/bootstrap.min.js", "./dist/js/bootstrap.js", "./dist/css/bootstrap.min.css", "./dist/css/bootstrap.css"], + "main": ["./dist/js/bootstrap.min.js", "./dist/css/bootstrap.min.css"], "ignore": [ "**/.*" ], |