Merge branch 'master' into search-bar

This commit is contained in:
jbavari
2015-10-05 10:06:14 -06: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.37",
"reflect-metadata": "0.1.1",