Arnold Daniels 7337f2961a Version 2.3.1-j6 ...

Merge branch 'master' of git://github.com/twitter/bootstrap into 2.3.0-j5-wip

Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/index.html
	docs/templates/pages/index.mustache
	js/bootstrap-typeahead.js
	package.json

2013-03-11 01:54:03 +01:00

..

unit

Version 2.3.1-j6

2013-03-11 01:54:03 +01:00

vendor

update jquery to 1.9

2013-02-05 20:00:50 -08:00

index.html

clean up styles

2013-02-05 22:29:59 -08:00

phantom.js

increase length of waitfor timeout for phantom

2012-04-23 03:18:13 -07:00

server.js

Fix GET data for js test server

2012-12-25 05:22:28 +01:00