]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/11744
authorMark Otto <otto@github.com>
Sun, 8 Dec 2013 10:00:37 +0000 (02:00 -0800)
committerMark Otto <otto@github.com>
Sun, 8 Dec 2013 10:00:37 +0000 (02:00 -0800)
commitc37b710e85e379ddffb305af8a765013c0cd0333
tree8c23e05b150a14a39c2be90b39d03343b8c994f7
parentb5008ebf9ca1c9c90a6ec73ae12e55a8f155017f
parente43e87b2f30a9f4967818f1ce8d25a4f88a1f490
Merge branch 'master' into pr/11744

Conflicts:
dist/css/bootstrap.min.css
dist/css/bootstrap.css
dist/css/bootstrap.min.css