Merge branch '2.0' into windows-mode

This commit is contained in:
Brandy Carney
2016-03-03 13:12:52 -05:00
45 changed files with 558 additions and 296 deletions

View File

@@ -1,4 +1,4 @@
import {TextInput} from 'ionic-angular';
import {TextInput} from '../../../../ionic';
export function run() {