]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Thu, 16 Jan 2014 00:25:29 +0000 (16:25 -0800)
committerMark Otto <otto@github.com>
Thu, 16 Jan 2014 00:25:29 +0000 (16:25 -0800)
commit78e81a1de99b23aae96ceec81499490538aafbb5
treeef6926f2a67874e830957d99ab65eda1194d7961
parent7e7264e22495ba1b85ec4dc95366f7abd146d4f9
parent95f24dca9aab5cfdd56d87d3ad8c6d3faa7d2928
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
docs/assets/css/pack.min.css
docs/assets/css/docs.css
docs/assets/css/pack.min.css