Merge branch 'minify-assets' of https://github.com/XhmikosR/bootstrap into XhmikosR-minify-assets

Browse Source

Conflicts:
	package.json

...

This commit is contained in:

Mark Otto

2014-01-11 14:48:04 -08:00

parent 7a2c352b50 d06d61dc12

commit e68d3b961e

9 changed files with 65 additions and 20 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

4

docs/assets/js/customize.min.js vendored

File diff suppressed because one or more lines are too long

7

docs/assets/js/docs.min.js vendored Normal file

File diff suppressed because one or more lines are too long