Brandy Carney 697e92ebcb Merge branch 'master' into list-border-refactor ...

Conflicts:
	ionic/util/dom.ts

2015-11-05 19:16:24 -05:00

..

test

chore(tabbar): rename tab-bar to tabbar

2015-11-02 19:38:30 -06:00

bootstrap.ts

fix(nav-registry): NavRegistry is a singleton

2015-11-05 17:07:02 -06:00

config.ts

chore(tabbar): rename tab-bar to tabbar

2015-11-02 19:38:30 -06:00

decorators.ts

fix(nav-registry): NavRegistry is a singleton

2015-11-05 17:07:02 -06:00

directives.ts

refactor(item-sliding)

2015-11-05 15:03:53 -06:00

modes.ts

chore(tabbar): rename tab-bar to tabbar

2015-11-02 19:38:30 -06:00