Arnold Daniels 48c7638a42 Merge branch '2.3.1-j6-wip' ...

Conflicts:
	README.md
	component.json
	docs/index.html
	package.json

2013-03-11 02:01:14 +01:00

..

css

Merge branch '2.3.1-j6-wip'

2013-03-11 02:01:14 +01:00

font

Improving customize

2012-12-07 17:48:27 +01:00

ico

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

2013-02-20 02:16:44 +01:00

img

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

2013-02-20 02:16:44 +01:00

js

Version 2.3.1-j6

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