mowen233/jspm-registry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into react-router-npm

Browse Source 
Conflicts:
	registry.json
This commit is contained in:
Max Peterson
2014-10-16 10:49:39 -05:00
parent bc2b981fde 922952cb02
commit 57182238f0
11 changed files with 132 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
registry.json
+16 -9
View File
@@ -1,26 +1,29 @@
{
"css": "github:systemjs/plugin-css",
"font": "github:guybedford/system-font",
"image": "github:systemjs/plugin-image",
"json": "github:systemjs/plugin-json",
"text": "github:systemjs/plugin-text",
"font": "github:guybedford/system-font",
"md": "github:guybedford/system-md",
"text": "github:systemjs/plugin-text",
"extra": "thing",
"ace": "github:ajaxorg/ace-builds",
"angular": "github:angular/bower-angular",
"angular-mocks": "github:angular/bower-angular-mocks",
"angular-cookies": "github:angular/bower-angular-cookies",
"angular-animate": "github:angular/bower-angular-animate",
"angular-aria": "github:angular/bower-angular-aria",
"angular-cookies": "github:angular/bower-angular-cookies",
"angular-material": "github:angular/bower-material",
"angular-mocks": "github:angular/bower-angular-mocks",
"angular-ui-router": "github:angular-ui/ui-router",
"angular-ui-router-extras": "github:christopherthielen/ui-router-extras",
"angular-ui-tree": "github:JimLiu/angular-ui-tree",
"angularFire": "github:firebase/angularFire",
"backbone": "npm:backbone",
"backbone.babysitter": "github:marionettejs/backbone.babysitter",
"backbone.wreqr": "github:marionettejs/backbone.wreqr",
"bootstrap": "github:twbs/bootstrap",
"chosen": "github:harvesthq/chosen",
"chart": "github:nnnick/Chart.js",
"chosen": "github:harvesthq/chosen",
"cola": "github:cujojs/cola",
"cram": "github:cujojs/cram",
"curl": "github:cujojs/curl",
@@ -29,9 +32,9 @@
"dropzone": "github:enyo/dropzone",
"ember": "github:components/ember",
"ember-data": "github:components/ember-data",
"test.js": "github:some/test",
"famous": "github:Famous/famous",
"famous-angular": "github:Famous/famous-angular",
"famous-polyfills": "github:Famous/polyfills",
"font-awesome": "npm:font-awesome",
"foundation": "github:zurb/bower-foundation",
"hammer": "github:hammerjs/hammer.js",
@@ -57,25 +60,29 @@
"moment": "github:moment/moment",
"msgs": "github:cujojs/msgs",
"mustache": "github:janl/mustache.js",
"nprogress": "github:rstacruz/nprogress",
"ng-multi-transclude": "github:zachsnow/ng-multi-transclude",
"nodelibs": "github:jspm/nodelibs",
"nprogress": "github:rstacruz/nprogress",
"parallax": "github:wagerfield/parallax",
"pikaday": "github:dbushell/Pikaday",
"poly": "github:cujojs/poly",
"pouchdb": "github:pouchdb/pouchdb",
"prism": "github:LeaVerou/prism",
"quint": "github:jquery/qunit",
"ratchet": "github:maker/ratchet",
"raphael": "github:DmitryBaranovskiy/raphael",
"reqwest": "github:ded/reqwest",
"ratchet": "github:maker/ratchet",
"react": "github:reactjs/react-bower",
"react-router": "npm:react-router",
"reqwest": "github:ded/reqwest",
"respond": "github:scottjehl/Respond",
"rest": "github:cujojs/rest",
"select2": "github:ivaynberg/select2",
"showdown": "github:showdownjs/showdown",
"skrollr": "github:Prinzhorn/skrollr",
"spin": "github:fgnass/spin.js",
"test.js": "github:some/test",
"tinygrowl": "github:ajkochanowicz/tinygrowl",
"trusktr-famous": "github:trusktr/famous",
"typeahead": "github:twitter/typeahead.js",
"underscore": "npm:underscore",
"webfont": "github:components/webfontloader",