]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' into bs3_alerts_default_class 9123/head
authorMark Otto <otto@github.com>
Tue, 6 Aug 2013 03:00:23 +0000 (20:00 -0700)
committerMark Otto <otto@github.com>
Tue, 6 Aug 2013 03:00:23 +0000 (20:00 -0700)
commit219f0fe7c54d6ece4fcfc58b140189c12e63f360
tree0355fdccf1ff8599f63a883dd4723c8d977e1e00
parent0faf42b4bc3fd301beaa5b5f9b4d367f69899b05
parentac3cb6974ad0573812b65a2054a5809da9946cb6
Merge branch '3.0.0-wip' into bs3_alerts_default_class

Conflicts:
dist/css/bootstrap.min.css
dist/css/bootstrap.css
dist/css/bootstrap.min.css
less/variables.less