]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
authorfat <jacobthornton@gmail.com>
Fri, 8 Feb 2013 03:47:01 +0000 (19:47 -0800)
committerfat <jacobthornton@gmail.com>
Fri, 8 Feb 2013 03:47:01 +0000 (19:47 -0800)
commit1bf070b4ce5ee40e4d248053d109c179bb42caf9
tree1a0b056458f535457f362bd8cbabfded837b5aab
parentd8a7a380bcfd25c66ca1dc54d1619dc272f4bbb4
parente3f3542d0b57fdcea0fbff2858b610f85a988d1d
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

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