]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'minify-assets' of https://github.com/XhmikosR/bootstrap into XhmikosR...
authorMark Otto <otto@github.com>
Sat, 11 Jan 2014 22:48:04 +0000 (14:48 -0800)
committerMark Otto <otto@github.com>
Sat, 11 Jan 2014 22:48:04 +0000 (14:48 -0800)
commite68d3b961e8fc4cadf1db378054d4f73bb99c81b
tree648737183df14befed1661d215c613135fe5dbbe
parent7a2c352b501cfd6dafebe2115c767609ca212a25
parentd06d61dc127c62a7f121de6c90498ce326db4b03
Merge branch 'minify-assets' of https://github.com/XhmikosR/bootstrap into XhmikosR-minify-assets

Conflicts:
package.json
Gruntfile.js
package.json