]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge pull request #11617 from guybedford/master
authorMark Otto <markdotto@gmail.com>
Sat, 30 Nov 2013 07:43:01 +0000 (23:43 -0800)
committerMark Otto <markdotto@gmail.com>
Sat, 30 Nov 2013 07:43:01 +0000 (23:43 -0800)
include jspm package configuration


Trivial merge