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

Browse Source

Conflicts:
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2013-08-05 12:20:52 -07:00

parent e23906faca efac0bf8d6

commit 96136dbb56

6 changed files with 6 additions and 19 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

dist/css/bootstrap.min.css

Vendored

+1 -1

File diff suppressed because one or more lines are too long