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

This commit is contained in:
Manu Mtz.-Almeida
2017-03-07 21:28:59 +01:00

View File

@ -7,7 +7,6 @@ import { ANALYZE_FOR_ENTRY_COMPONENTS, APP_INITIALIZER, ComponentFactoryResolver
import { APP_BASE_HREF, Location, LocationStrategy, HashLocationStrategy, PathLocationStrategy, PlatformLocation } from '@angular/common'; import { APP_BASE_HREF, Location, LocationStrategy, HashLocationStrategy, PathLocationStrategy, PlatformLocation } from '@angular/common';
import { DOCUMENT } from '@angular/platform-browser'; import { DOCUMENT } from '@angular/platform-browser';
import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { HttpModule } from '@angular/http';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
/** /**
@ -358,17 +357,14 @@ export { IonicGestureConfig } from './gestures/gesture-config';
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
HttpModule,
FormsModule, FormsModule,
ReactiveFormsModule, ReactiveFormsModule,
], ],
exports: [ exports: [
CommonModule, CommonModule,
HttpModule,
FormsModule, FormsModule,
ReactiveFormsModule, ReactiveFormsModule,
Avatar, Avatar,
Backdrop, Backdrop,
Badge, Badge,