]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' into bs3_remove_icons
authorMark Otto <otto@github.com>
Fri, 28 Jun 2013 01:49:05 +0000 (18:49 -0700)
committerMark Otto <otto@github.com>
Fri, 28 Jun 2013 01:49:05 +0000 (18:49 -0700)
commit62f76ad33f5a70c21f91e729963e049547ffc391
tree3e611f99d09a7f658dc1e529a820aa87f7c4c557
parentf64fe29003159669404f8f5a7a20551fec263904
parentcb483b67589df7ac3ece33303b8ce944b3ac4b0e
Merge branch '3.0.0-wip' into bs3_remove_icons

Conflicts:
docs/components.html
docs/components.html
less/variables.less