Merge branch 'bootstrap-refactor' into 2.0

This commit is contained in:
Adam Bradley
2016-05-31 15:50:21 -05:00
198 changed files with 1644 additions and 1637 deletions

View File

@@ -1,17 +1,9 @@
import {App} from '../../../../../src';
import {
Control,
ControlGroup,
NgForm,
Validators,
NgControl,
ControlValueAccessor,
NgControlName,
NgFormModel,
FormBuilder
} from '@angular/common';
import {Component} from '@angular/core';
import {Control, ControlGroup, NgFormModel} from '@angular/common';
import {ionicBootstrap} from '../../../../../src';
@App({
@Component({
templateUrl: 'main.html'
})
class E2EApp {
@@ -66,3 +58,5 @@ class E2EApp {
ev.preventDefault();
}
}
ionicBootstrap(E2EApp);