]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' of https://github.com/apexskier/bootstrap into apexskier-master
authorMark Otto <otto@github.com>
Sat, 24 Aug 2013 06:16:37 +0000 (23:16 -0700)
committerMark Otto <otto@github.com>
Sat, 24 Aug 2013 06:16:37 +0000 (23:16 -0700)
commit0a2ec5545b499d87aca5b132ba7ac6bc5ede0949
treed108b427e4a901257d7c7eacad0841cfe2a13dc6
parent99afaba2bfa5bcab8ee070477fba4b15db8d2af6
parent9bdc841accb46e77a7f7347e82d0b19aea5703b6
Merge branch 'master' of https://github.com/apexskier/bootstrap into apexskier-master

Conflicts:
dist/css/bootstrap.min.css
assets/js/raw-files.js
dist/css/bootstrap.css
dist/css/bootstrap.min.css
less/tables.less