Adam Bradley cae0c0e050 Merge branch 'master' into v4 ...

# Conflicts:
#	package.json
#	src/components/badge/badge.scss
#	src/components/slides/slides.scss

2017-05-02 12:55:07 -05:00

..

animations

fix(navcontroller): lazy loading is queued

2017-04-18 20:55:41 +02:00

bindings/angular

fix(core): update ionic global property names

2017-04-26 17:14:20 -05:00

components

Merge branch 'master' into v4

2017-05-02 12:55:07 -05:00

config

chore(docs): moving docs from /docs/v2 to /docs

2017-03-29 11:00:52 -05:00

fonts

chore(fonts): add roboto woff2 fonts

2017-02-08 10:19:30 -06:00

gestures

fix(sliding-gesture): missing return value

2017-04-25 21:33:30 +02:00

navigation

refactor(nav-interfaces): remove unecessary semicolons (#11450)

2017-05-01 02:35:46 +02:00

platform

fix(menu): rtl support

2017-04-24 01:02:20 +02:00

tap-click

doc(haptic): fix typo (#11461)

2017-05-01 18:12:55 +02:00

themes

fix(rtl): add correct text-align (#11353)

2017-05-02 11:10:18 -04:00

transitions

fix(navcontroller): lazy loading is queued

2017-04-18 20:55:41 +02:00

util

Merge branch 'master' into v4

2017-05-02 12:55:07 -05:00

index.ts

feat(slides): add web component slides to ionic.

2017-04-28 13:53:15 -05:00

module.ts

feat(slides): add web component slides to ionic.

2017-04-28 13:53:15 -05:00