aboutsummaryrefslogtreecommitdiff
path: root/docs/_includes/docs-nav.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-03-30 12:54:16 -0700
committerMark Otto <[email protected]>2013-03-30 12:54:16 -0700
commit7c3c5ed7cc07748d33989058d9e7eef11e367c28 (patch)
tree317ea46787d2099be870873bdde9c1e044594b92 /docs/_includes/docs-nav.html
parent906ff98601273a23c74dae41575201f9fcf05dcf (diff)
parent812b99263f08d2306219ed6fcbe1685be17d6a10 (diff)
downloadbootstrap-7c3c5ed7cc07748d33989058d9e7eef11e367c28.tar.xz
bootstrap-7c3c5ed7cc07748d33989058d9e7eef11e367c28.zip
Merge branch 'pickypg-patch-1' into 3.0.0-wip
Conflicts: less/dropdowns.less
Diffstat (limited to 'docs/_includes/docs-nav.html')
0 files changed, 0 insertions, 0 deletions