Arnold Daniels
|
695c18090a
|
Merge branch 'master' of git://github.com/twitter/bootstrap into 2.3.0-j4
Fixed variables when loading custom.json
Conflicts:
Makefile
README.md
component.json
composer.json
docs/assets/css/bootstrap-responsive.css
docs/assets/js/application.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/index.html
docs/javascript.html
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-typeahead.js
package.json
|
2013-02-20 02:16:44 +01:00 |
|
Arnold Daniels
|
65f8a89ebe
|
Build 2.2.2-j4
|
2013-01-27 23:05:40 -08:00 |
|
Mark Otto
|
f74990d898
|
Version bump
|
2012-12-22 16:10:06 -08:00 |
|
Mark Otto
|
529ecc5a77
|
Version bump
|
2012-12-10 18:31:04 -08:00 |
|
Arnold Daniels
|
f997a9ada7
|
Merge branch 'master' of git://github.com/twitter/bootstrap into 2.2.2-j3
Conflicts:
Makefile
README.md
component.json
docs/assets/css/docs.css
docs/assets/img/bs-docs-bootstrap-features.png
docs/assets/img/bs-docs-responsive-illustrations.png
docs/assets/img/bs-docs-twitter-github.png
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/base-css.html
docs/components.html
docs/customize.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/javascript.html
docs/scaffolding.html
docs/templates/layout.mustache
docs/templates/pages/customize.mustache
docs/templates/pages/index.mustache
js/bootstrap-typeahead.js
package.json
|
2012-12-10 00:22:22 +01:00 |
|
Arnold Daniels
|
ccf9dd944f
|
Preparing for Boostrap-server 2.0
|
2012-12-06 20:21:02 +01:00 |
|
Mark Otto
|
79b7017227
|
version bump
|
2012-11-05 09:32:48 -08:00 |
|
fat
|
3b3dd3ac3c
|
2.2.1 - hotfix for carousel
|
2012-10-30 21:59:56 -07:00 |
|
fat
|
92e7f166e7
|
remove haunt, remove bootstrap dir, add bower support
|
2012-10-29 21:27:34 -07:00 |
|