Commit 7c5f7a4e authored by Mark Otto's avatar Mark Otto

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

parents b6238c5f dd3eefc0
......@@ -2,6 +2,9 @@
"name": "bootstrap",
"version": "3.0.0",
"main": ["./docs/assets/js/bootstrap.js", "./docs/assets/css/bootstrap.css"],
"ignore": [
"**/.*"
],
"dependencies": {
"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