Adam Bradley b7d1d2debf Merge branch 'master' into alpha38 ...

Conflicts:
	ionic/components/nav/view-controller.ts
	ionic/components/tabs/tab.ts

2015-10-05 11:47:45 -05:00

..

e2e.ts

chore(): use class selectors in e2e

2015-09-22 11:25:27 -05:00

index.ts

feat(button): Added ability to give the button a "type" which will be converted to an attribute.

2015-10-05 12:37:50 -04:00

main.html

refactor(overlay): actionsheet/popup

2015-10-04 22:35:54 -05:00