]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.0-wip'
authorJacob Thornton <jacobthornton@gmail.com>
Tue, 31 Jan 2012 21:59:40 +0000 (13:59 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Tue, 31 Jan 2012 21:59:40 +0000 (13:59 -0800)
commitfd700e358da02434343c58e7f86eb2e8a8ba2411
tree831e00c3f661af6bf3bb977ab31a8225d969e822
parentb9de88890e3db18b48ef10cd5a718002cb5dc4a0
parente75bc5eb5ffca534fd3a84d749e8b39824654ebb
Merge branch '2.0-wip'

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