From: Chris Rebert Date: Sat, 8 Mar 2014 05:20:06 +0000 (-0800) Subject: Merge pull request #12972 from twbs/cleaner-shrinkwrap X-Git-Tag: v3.2.0~415 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41b28689062eeb564f41fcf06fac95521d0449a6;p=thirdparty%2Fbootstrap.git Merge pull request #12972 from twbs/cleaner-shrinkwrap Exclude `resolved` from npm shrinkwrap to avoid irrelevant changes --- 41b28689062eeb564f41fcf06fac95521d0449a6