]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into docs-theme-toggler 13463/head
authorMark Otto <otto@github.com>
Fri, 23 May 2014 01:54:25 +0000 (18:54 -0700)
committerMark Otto <otto@github.com>
Fri, 23 May 2014 01:54:25 +0000 (18:54 -0700)
commit326f6b2b873e7bd888204f754ebe394bbb124c56
treeefb528f8b9b1459e8a3d57a61cefcd9942cd8273
parent12b5d46f17a125021c5083fbc88b53a7fb86a096
parentfab9ab8fe9b51ebc88872482556df3f793e5ac4a
Merge branch 'master' into docs-theme-toggler

Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/css/docs.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/_includes/header.html