]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
authorJacob Thornton <jacobthornton@gmail.com>
Wed, 24 Jul 2013 05:59:33 +0000 (22:59 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Wed, 24 Jul 2013 05:59:33 +0000 (22:59 -0700)
commit3cfa1c8a30beb081167105b7ea006e9089e566f5
tree9a15de39e176d18912ad198151f67572273e11f5
parent6841c5096888b9a1f8b4b9453adac23cee3788d9
parent1d1bd62598f309eeffb9fa4e277e02b633520a7f
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
dist/js/bootstrap.min.js