javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-19 03:32:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	demos/component-docs/menus/menus.html
This commit is contained in:
Brandy Carney
2015-10-08 15:18:24 -04:00
parent c2d56d8623 0171f84cc1
commit e7d1bb9812
18 changed files with 157 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
demos/component-docs/forms/forms.ts
View File

@ -1,8 +1,8 @@
import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/forms';
import {IonicView} from 'ionic/ionic';
import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/angular2';
import {Page} from 'ionic/ionic';
@IonicView({
@Page({
templateUrl: 'forms/forms.html',
bindings: [FormBuilder]
})