Adam Bradley 50b6fdea8d Merge branch 'master' into alpha38 ...

Conflicts:
	ionic/components/search-bar/search-bar.ts
	ionic/config/decorators.ts

2015-10-06 20:38:04 -05:00

..

test

fix(config): set user platform modes

2015-10-05 15:09:16 -05:00

bootstrap.ts

fix(nav): update loader

2015-10-05 11:43:53 -05:00

config.ts

fix(config)

2015-10-05 15:20:47 -05:00

decorators.ts

:derp:

2015-10-06 18:31:05 -05:00

decorators.ts.orig

Merge branch 'master' into alpha38

2015-10-06 20:38:04 -05:00

directives.ts

update IONIC_DIRECTIVES api doc

2015-10-06 13:03:59 -05:00

modes.ts

fix(config): set user platform modes

2015-10-05 15:09:16 -05:00