]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'gridcontainer' of https://github.com/jacobrask/bootstrap into jacobrask...
authorMark Otto <markotto@twitter.com>
Sun, 19 Feb 2012 23:01:25 +0000 (15:01 -0800)
committerMark Otto <markotto@twitter.com>
Sun, 19 Feb 2012 23:01:25 +0000 (15:01 -0800)
commit89ccbdf8d1a5dc1b9e4da19a910a5108e4b7988b
tree712db213fa00767d31a20e6f7fa214902fb28a83
parent5f2d2893d20fec41f9291f57f7d4ab4c65e90c29
parent82457603b65b177e70793eebbcf5a9c23873a770
Merge branch 'gridcontainer' of https://github.com/jacobrask/bootstrap into jacobrask-gridcontainer

Conflicts:
docs/assets/bootstrap.zip
docs/assets/bootstrap.zip
docs/assets/css/bootstrap.css
less/mixins.less