Skip to content

Commit 0073995

Browse files
authored
Merge branch 'master' into a11y-tab
2 parents e25b77f + ec4ea06 commit 0073995

File tree

149 files changed

+2431
-501
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+2431
-501
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ src/lib/core/datetime/** @mmalerba
4949
# CDK
5050
src/cdk/coercion/** @jelbourn
5151
src/cdk/rxjs/** @jelbourn
52-
src/cdk/observers/** @crisbeto @jelbourn
52+
src/cdk/observers/** @jelbourn @crisbeto
53+
src/cdk/collections/** @jelbourn @crisbeto @andrewseguin
5354
src/cdk/a11y/** @jelbourn @devversion
5455
src/cdk/platform/** @jelbourn @devversion
5556
src/cdk/bidi/** @jelbourn

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ sudo: false
33
dist: trusty
44

55
node_js:
6-
- '--lts'
6+
- '8'
77

88
addons:
99
jwt:
@@ -43,7 +43,6 @@ env:
4343

4444
before_install:
4545
- source ./scripts/ci/travis-env.sh
46-
- npm i -g npm@^5.3.0
4746

4847
install:
4948
- npm install
@@ -56,4 +55,4 @@ script:
5655

5756
cache:
5857
directories:
59-
- $HOME/.npm
58+
- ./node_modules/

0 commit comments

Comments
 (0)