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

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

2015-10-07 10:59:15 -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

docs(ionicConfig): add inital config docs

2015-10-07 09:37:02 -04:00

decorators.ts

rename IonicComponent to ConfigComponent

2015-10-07 10:54:28 -05:00

directives.ts

Merge branch 'master' into alpha38

2015-10-07 10:59:15 -05:00

modes.ts

fix(config): set user platform modes

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