]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into fix-13386
authorfat <jacobthornton@gmail.com>
Tue, 24 Jun 2014 06:08:23 +0000 (23:08 -0700)
committerfat <jacobthornton@gmail.com>
Tue, 24 Jun 2014 06:08:23 +0000 (23:08 -0700)
commit0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3
tree7b88c388d526ada7b564f1faf44cda92276f2722
parentf071549c8408241b88a95192e477816d2402eb6e
parentb31c35b63629ec750f338a646f6b730bd675b734
Merge branch 'master' into fix-13386

Conflicts:
js/carousel.js
js/carousel.js