]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'navtext' of https://github.com/liuyl/bootstrap into liuyl-navtext
authorMark Otto <otto@github.com>
Sat, 3 Aug 2013 02:30:03 +0000 (19:30 -0700)
committerMark Otto <otto@github.com>
Sat, 3 Aug 2013 02:30:03 +0000 (19:30 -0700)
commita3be713f8f61e8c37c4bf3db94a51dfc83ac935b
tree69324c05407929146e41658e0ca08ce40350539e
parente8145ac9390b92aca69a84dfdd561793b72e7540
parent7cfcfdfe64159b4ea7b94606f9303ab567049198
Merge branch 'navtext' of https://github.com/liuyl/bootstrap into liuyl-navtext

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