Arnold Daniels
|
9ec4b5736e
|
Using 'p' instead of 'j' in version
Fixed broken composer.json
|
2013-07-12 14:03:30 +02:00 |
|
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
|
1560ef2410
|
Composer: package replaces twitter/bootstrap + author. Fixes #57
|
2013-01-27 22:53:38 -08:00 |
|
Wesley Overdijk
|
bf3dea668f
|
Update composer.json
target-dir is not needed. All it does, is nest everything another level deeper. It should only be used for completing psr-0 paths.
|
2013-01-06 16:43:41 +01: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 |
|
Trent Steel
|
4d593618e0
|
add composer.json
|
2012-11-16 17:01:21 +10:00 |
|