Skip to content

B
bootstrap
Commit 7c5f7a4e authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

parents b6238c5f dd3eefc0
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
bower.json
View file @ 7c5f7a4e
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
"name": "bootstrap", "name": "bootstrap",
"version": "3.0.0", "version": "3.0.0",
"main": ["./docs/assets/js/bootstrap.js", "./docs/assets/css/bootstrap.css"], "main": ["./docs/assets/js/bootstrap.js", "./docs/assets/css/bootstrap.css"],
"ignore": [
"**/.*"
],
"dependencies": { "dependencies": {
"jquery": ">= 1.9.0" "jquery": ">= 1.9.0"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment