]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/11648
authorMark Otto <otto@github.com>
Sat, 30 Nov 2013 21:09:55 +0000 (13:09 -0800)
committerMark Otto <otto@github.com>
Sat, 30 Nov 2013 21:09:55 +0000 (13:09 -0800)
commit82bbccde9bc91543e7b1a4612d4d87c75c737bba
treee8abb61d6f8d58b20481e2704e5782cf3af1427f
parent702ad4c3025c8db0ec482e5eccd339cf1e6c2a5a
parent56113201017cc15bc677a99f61730b2a34cac2a5
Merge branch 'master' into pr/11648

Conflicts:
dist/css/bootstrap.min.css
less/grid.less
dist/css/bootstrap.css
dist/css/bootstrap.min.css
less/grid.less
less/mixins.less