aboutsummaryrefslogtreecommitdiff
path: root/docs/components.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-02-19 15:04:52 -0800
committerMark Otto <[email protected]>2012-02-19 15:04:52 -0800
commit3470c0dc49aa3f66630b2166391df88f1fbd0757 (patch)
tree17c5e64dab26bdffb1e4fd04d63436238b7ec127 /docs/components.html
parent89ccbdf8d1a5dc1b9e4da19a910a5108e4b7988b (diff)
parent51ec513b5c50123761350d2bcd27dafb07192a7e (diff)
downloadbootstrap-3470c0dc49aa3f66630b2166391df88f1fbd0757.tar.xz
bootstrap-3470c0dc49aa3f66630b2166391df88f1fbd0757.zip
Merge branch 'alert-headers' of https://github.com/jacobrask/bootstrap into jacobrask-alert-headers
Conflicts: docs/assets/bootstrap.zip
Diffstat (limited to 'docs/components.html')
0 files changed, 0 insertions, 0 deletions