Brandy Carney e7d1bb9812 Merge remote-tracking branch 'origin/master' ...

Conflicts:
	demos/component-docs/menus/menus.html

2015-10-08 15:18:24 -04:00

..

popups.html

refactor(padding): changed padding to attributes

2015-10-08 15:15:20 -04:00

popups.ts

docs(demos): use Page instead of IonicView

2015-10-08 14:13:06 -05:00