1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-25 21:09:06 +02:00

Merge branch 'accessibility' into 2.1.0-wip

Conflicts:
	docs/assets/js/bootstrap.min.js
	docs/javascript.html
	docs/templates/pages/javascript.mustache
This commit is contained in:
Jacob Thornton
2012-06-02 16:11:35 -07:00
12 changed files with 577 additions and 373 deletions

File diff suppressed because one or more lines are too long