Merge branch 'master' of github.com:jspm/registry

2013-11-06 19:11:46 +02:00
parent 20202c09d3 013644e51f
commit bbaed75b81
5 changed files with 11 additions and 17 deletions
@@ -1,6 +1,6 @@
 {
  "main": "dist/js/bootstrap",
-  "dependencyShim": {
+  "shim": {
    "dist/js/bootstrap": ["jquery", "../css/bootstrap.css!"]
  },
  "dependencyMap": {