diff options
| author | fat <[email protected]> | 2014-07-21 22:44:35 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2014-07-21 22:44:35 -0700 |
| commit | 4775c9296ab95b49fc1e4b0f86d1db26176013ef (patch) | |
| tree | bc97a0cadbe6baa255d9edb83e25c7b99a195c09 /docs/_includes/header.html | |
| parent | 97cb2803d7698bdafc57820017ab8550b031d121 (diff) | |
| parent | ee12ce83057233d271f42162ef3dd2d42d315176 (diff) | |
| download | bootstrap-4775c9296ab95b49fc1e4b0f86d1db26176013ef.tar.xz bootstrap-4775c9296ab95b49fc1e4b0f86d1db26176013ef.zip | |
Merge branch 'dropdown-aria' of git://github.com/mckramer/bootstrap into mckramer-dropdown-aria
Conflicts:
docs/_includes/js/dropdowns.html
Diffstat (limited to 'docs/_includes/header.html')
0 files changed, 0 insertions, 0 deletions