Merge branch 'master' into icon_paths

Browse source

Conflicts:
	dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.css.map

...

This commit is contained in:

Mark Otto 2014-05-12 20:26:23 -07:00

parent 31956be6ef d4c7248749

commit c42cd8164c

7 changed files with 12 additions and 5 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

docs/dist/css/bootstrap.css.map vendored

View file

File diff suppressed because one or more lines are too long

2

docs/dist/css/bootstrap.min.css vendored

View file

File diff suppressed because one or more lines are too long