Merge remote-tracking branch 'origin/master'
This commit is contained in:
+2
-2
@@ -120,7 +120,7 @@
|
|||||||
"chai": "npm:chai",
|
"chai": "npm:chai",
|
||||||
"chart": "github:nnnick/Chart.js",
|
"chart": "github:nnnick/Chart.js",
|
||||||
"child_process": "github:jspm/nodelibs-child_process",
|
"child_process": "github:jspm/nodelibs-child_process",
|
||||||
"chosen": "github:harvesthq/chosen",
|
"chosen": "github:harvesthq/chosen",p
|
||||||
"chronoman": "npm:chronoman",
|
"chronoman": "npm:chronoman",
|
||||||
"cluster": "github:jspm/nodelibs-cluster",
|
"cluster": "github:jspm/nodelibs-cluster",
|
||||||
"cola": "github:cujojs/cola",
|
"cola": "github:cujojs/cola",
|
||||||
@@ -306,7 +306,7 @@
|
|||||||
"theseus": "npm:theseus",
|
"theseus": "npm:theseus",
|
||||||
"theseus-angular": "npm:theseus-angular",
|
"theseus-angular": "npm:theseus-angular",
|
||||||
"topo": "github:capaj/topo-browser",
|
"topo": "github:capaj/topo-browser",
|
||||||
"timers": "github:jspm/nodelibs-timers",c
|
"timers": "github:jspm/nodelibs-timers",
|
||||||
"tinycolor": "github:bgrins/TinyColor",
|
"tinycolor": "github:bgrins/TinyColor",
|
||||||
"tinygrowl": "github:ajkochanowicz/tinygrowl",
|
"tinygrowl": "github:ajkochanowicz/tinygrowl",
|
||||||
"tls": "github:jspm/nodelibs-tls",
|
"tls": "github:jspm/nodelibs-tls",
|
||||||
|
|||||||
Reference in New Issue
Block a user