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

179 B

Raw Permalink Blame History

View Raw