Merge branch 'master' into css-refactor

This commit is contained in:
Brandy Carney
2015-12-04 17:04:00 -05:00
25 changed files with 178 additions and 32 deletions

View File

@@ -36,6 +36,8 @@ import {Config} from '../../config/config';
* </ion-segment>
* </form>
* ```
*
* @see {@link /docs/v2/components#segment Segment Component Docs}
*/
@Directive({
selector: 'ion-segment'