Merge branch '2.0' of github.com:driftyco/ionic into 2.0

This commit is contained in:
perry
2016-01-20 13:41:09 -06:00
28 changed files with 271 additions and 119 deletions

View File

@ -2,6 +2,7 @@
"name": "ionic-framework",
"version": "2.0.0-alpha.<%= ionicVersion %>",
"license": "Apache-2.0",
"keywords": ["ionic", "framework", "mobile", "app", "hybrid", "webapp"],
"repository": {
"type": "git",
"url": "https://github.com/driftyco/ionic2.git"