Merge branch '2.0' into picker

# Conflicts:
#	ionic/components.ts
This commit is contained in:
Adam Bradley
2016-04-21 23:47:16 -05:00
65 changed files with 1105 additions and 313 deletions

View File

@@ -3,7 +3,6 @@ export * from './components/app/id';
export * from './components/action-sheet/action-sheet';
export * from './components/alert/alert';
export * from './components/badge/badge';
export * from './components/blur/blur';
export * from './components/button/button';
export * from './components/checkbox/checkbox';
export * from './components/content/content';