]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Wed, 11 Sep 2013 23:35:27 +0000 (16:35 -0700)
committerMark Otto <otto@github.com>
Wed, 11 Sep 2013 23:35:27 +0000 (16:35 -0700)
commitd88e743b417c3e149c9fcb02c8d5580afb8baee0
treed8018f676ed81eb5ec5dcbfbb990ca4aa6d300fd
parentfddcadbc21cf35fb584ab02dc0817612da6596a4
parent725e2b9ccf66cd54e64ff5d15bf8b2744b5122cd
Merge branch 'master' of github.com:twbs/bootstrap

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