]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/11817
authorMark Otto <otto@github.com>
Sun, 15 Dec 2013 23:07:38 +0000 (15:07 -0800)
committerMark Otto <otto@github.com>
Sun, 15 Dec 2013 23:07:38 +0000 (15:07 -0800)
commitd1f15baa713764440e8335b8dbab580887caaa12
tree22795d45cb61184ae349c66e47352051a2f7ec0b
parent3b5e0c9a3cae9bfae38253ae153a3426d1f81ad3
parentb04a1de9b097de7f4df95b30df040efe86563e75
Merge branch 'master' into pr/11817

Conflicts:
dist/css/bootstrap.min.css
less/input-groups.less
dist/css/bootstrap.css
dist/css/bootstrap.min.css
less/input-groups.less