diff options
| author | Jacob Thornton <[email protected]> | 2012-06-02 16:11:35 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-06-02 16:11:35 -0700 |
| commit | 5e5965ca6fe719e83f5eb06222170b87dba78f02 (patch) | |
| tree | fa6723ece71b5f733d608c6228521609a4adbd99 /docs/examples.html | |
| parent | ebc69356637143c938c07904d10928c11e742196 (diff) | |
| parent | b1d7c34086ec95a2b0507c595e3a353cdc550b9b (diff) | |
| download | bootstrap-5e5965ca6fe719e83f5eb06222170b87dba78f02.tar.xz bootstrap-5e5965ca6fe719e83f5eb06222170b87dba78f02.zip | |
Merge branch 'accessibility' into 2.1.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
docs/javascript.html
docs/templates/pages/javascript.mustache
Diffstat (limited to 'docs/examples.html')
0 files changed, 0 insertions, 0 deletions