Merge remote-tracking branch 'origin/master'

Conflicts:
	ionic/components.js
This commit is contained in:
Adam Bradley
2015-05-30 13:28:46 -05:00
24 changed files with 14203 additions and 55 deletions

View File

@ -24,5 +24,7 @@ export * from 'ionic/components/radio/radio'
// export * from 'ionic/components/split-view/split-view'
export * from 'ionic/components/segment/segment'
export * from 'ionic/components/switch/switch'
export * from 'ionic/components/toolbar/toolbar'
export * from 'ionic/components/view/view'
export * from 'ionic/components/tabs/tabs'
export * from 'ionic/components/tabs/tab'