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

Browse Source

Conflicts:
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2013-08-02 20:19:20 -07:00

parent a0c44329e3 56aedcb713

commit 4bac2c567a

3 changed files with 3 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