diff options
| author | fat <[email protected]> | 2013-12-29 19:23:15 -0800 |
|---|---|---|
| committer | fat <[email protected]> | 2013-12-29 19:23:15 -0800 |
| commit | 2a0b99104c596952bdac6a40053843dfba98534f (patch) | |
| tree | d8923f6bbbc3c628d0e900c2666981dd09a2400d /docs/dist/css | |
| parent | 8a62f211131e2a5be7b7413281845c2f66716be4 (diff) | |
| parent | bbe551044c00bf89fdc9bdfac809fead62767bdb (diff) | |
| download | bootstrap-2a0b99104c596952bdac6a40053843dfba98534f.tar.xz bootstrap-2a0b99104c596952bdac6a40053843dfba98534f.zip | |
Merge branch 'dropdown-aria-roles' of git://github.com/plumlee/bootstrap into plumlee-dropdown-aria-roles
Conflicts:
js/dropdown.js
Diffstat (limited to 'docs/dist/css')
0 files changed, 0 insertions, 0 deletions