2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00

Merge branch 'master' of https://github.com/cvrebert/bootstrap into 2.3.3-wip

This commit is contained in:
Mark Otto
2013-07-25 22:17:42 -07:00
50 changed files with 110 additions and 110 deletions
+2 -2
View File
@@ -3,12 +3,12 @@
, "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development."
, "version": "2.3.2"
, "keywords": ["bootstrap", "css"]
, "homepage": "http://twitter.github.com/bootstrap/"
, "homepage": "http://twbs.github.com/bootstrap/"
, "author": "Twitter Inc."
, "scripts": { "test": "make test" }
, "repository": {
"type": "git"
, "url": "https://github.com/twitter/bootstrap.git"
, "url": "https://github.com/twbs/bootstrap.git"
}
, "licenses": [
{