]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge pull request #17270 from jdanyow/patch-1
authorChris Rebert <github@chrisrebert.com>
Thu, 1 Oct 2015 17:30:56 +0000 (10:30 -0700)
committerChris Rebert <github@chrisrebert.com>
Thu, 1 Oct 2015 17:30:56 +0000 (10:30 -0700)
Update jspm package configuration

1  2 
package.json

diff --cc package.json
Simple merge