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

..

assets

Merge branch '2.3.1-j6-wip'

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

build

Added responsive tables

2012-12-14 16:27:33 +01:00

examples

Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip

2013-02-05 19:39:49 -08:00

templates

2.3.1

2013-02-28 20:55:14 -08:00

base-css.html

Merge branch '2.3.1-j6-wip'

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

components.html

Merge branch '2.3.1-j6-wip'

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

customize.html

Merge branch '2.3.1-j6-wip'

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

extend.html

Merge branch '2.3.1-j6-wip'

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

getting-started.html

Merge branch '2.3.1-j6-wip'

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

index.html

Merge branch '2.3.1-j6-wip'

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

javascript.html

Merge branch '2.3.1-j6-wip'

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

scaffolding.html

Merge branch '2.3.1-j6-wip'

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