Merge branch 'navtext' of https://github.com/liuyl/bootstrap into liuyl-navtext

Browse Source

Conflicts:
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2013-08-02 19:30:03 -07:00

parent e8145ac939 7cfcfdfe64

commit a3be713f8f

3 changed files with 5 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

dist/css/bootstrap.min.css vendored

File diff suppressed because one or more lines are too long