]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' of https://github.com/charnog/bootstrap into charnog-master
authorMark Otto <otto@github.com>
Sat, 24 Aug 2013 06:40:12 +0000 (23:40 -0700)
committerMark Otto <otto@github.com>
Sat, 24 Aug 2013 06:40:12 +0000 (23:40 -0700)
commitfc0e7686fba0ea64719ae968585b0e4846ea0c8b
tree2cb0c51823b9b2a42631f0d21a80afead3b8c2ce
parent705f7ba2790c4809fe8f04b717830e338d3fae40
parent4284fc0a5e9eb25c93e1b7579c23d002967a1b22
Merge branch 'master' of https://github.com/charnog/bootstrap into charnog-master

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