]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.0-wip'
authorJacob Thornton <jacobthornton@gmail.com>
Wed, 1 Feb 2012 01:27:01 +0000 (17:27 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Wed, 1 Feb 2012 01:27:01 +0000 (17:27 -0800)
commitbdfb05dbac0b07c7c6447a39b2658038563603d3
treeecabe001c1cfce45025d46d07fda7e8357b9b155
parentcabba91c7c74fcf6dd80bef8b3ea2717eec997b3
parentc8fad2590247a9581c62dadb526a540e369a3e88
Merge branch '2.0-wip'

Conflicts:
docs/assets/bootstrap.zip
docs/assets/bootstrap.zip