]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' of git://github.com/muan/bootstrap into muan-3.0.0-wip
authorfat <jacobthornton@gmail.com>
Thu, 18 Jul 2013 04:14:02 +0000 (21:14 -0700)
committerfat <jacobthornton@gmail.com>
Thu, 18 Jul 2013 04:14:02 +0000 (21:14 -0700)
commit102df4ff3334663b20c8730bbb32a673b4259edf
tree83f4b75cff48ad066b6f2b409ddf5e2a083432e1
parentbf38241f0d95811dd6be0977f91e9a30c3da16c4
parent55fa1acbd6f351d56b873eef6c59f72899cece49
Merge branch '3.0.0-wip' of git://github.com/muan/bootstrap into muan-3.0.0-wip

Conflicts:
docs/assets/js/bootstrap.min.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js