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

Merge branch 'master' into alpha38

Browse Source 
Conflicts:
	ionic/components/search-bar/search-bar.ts
	ionic/config/decorators.ts
This commit is contained in:
Adam Bradley
2015-10-07 10:59:15 -05:00
parent 0be37b201f 19aa828846
commit bdaed1b2ca
9 changed files with 163 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ionic/components.ts
View File

@ -2,6 +2,7 @@
export * from 'ionic/components/app/app'
export * from 'ionic/components/app/id'
export * from 'ionic/components/action-sheet/action-sheet'
export * from 'ionic/components/blur/blur'
export * from 'ionic/components/button/button'
export * from 'ionic/components/card/card'
export * from 'ionic/components/checkbox/checkbox'