aboutsummaryrefslogtreecommitdiff
path: root/customize.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-13 13:48:33 -0700
committerMark Otto <[email protected]>2013-08-13 13:48:33 -0700
commitbd93ed2cb6034de2f287f7508b4fd0b1d28ab0d3 (patch)
tree2a59b9815cb02226a694c345cf942c9ad869810f /customize.html
parent3c772b1cebfed73570247691917b40fcf3d95aa2 (diff)
parenta8769b8cab1799168b31f1a5afd403f323a6b6d4 (diff)
downloadbootstrap-bd93ed2cb6034de2f287f7508b4fd0b1d28ab0d3.tar.xz
bootstrap-bd93ed2cb6034de2f287f7508b4fd0b1d28ab0d3.zip
Merge branch '3.0.0-wip' into bs3_navbar_overhaul
Conflicts: dist/css/bootstrap.min.css
Diffstat (limited to 'customize.html')
0 files changed, 0 insertions, 0 deletions