Merge branch 'master' into alpha38

This commit is contained in:
Adam Bradley
2015-10-05 11:06:05 -05:00

View File

@@ -6,6 +6,10 @@
"type": "git",
"url": "https://github.com/driftyco/ionic2.git"
},
"scripts": {
"test": "gulp tests",
"link": "npm install && gulp src && npm link"
},
"dependencies": {
"angular2": "2.0.0-alpha.38",
"@reactivex/rxjs": "0.0.0-prealpha.3",