merge conflicts

This commit is contained in:
mhartington
2015-12-04 15:39:42 -05:00
27 changed files with 112 additions and 40 deletions

View File

@@ -65,6 +65,7 @@ class MediaSwitch {
* </ion-list>
* ```
*
* @see {@link /docs/v2/components#switch Switch Component Docs}
*/
@Component({
selector: 'ion-switch',