Anders Hejlsberg
|
4f99bc19c8
|
Merge branch 'master' into restTuples
# Conflicts:
# tests/baselines/reference/APISample_Watch.errors.txt
# tests/baselines/reference/APISample_WatchWithDefaults.errors.txt
# tests/baselines/reference/APISample_WatchWithOwnWatchHost.errors.txt
# tests/baselines/reference/APISample_compile.errors.txt
# tests/baselines/reference/APISample_jsdoc.errors.txt
# tests/baselines/reference/APISample_linter.errors.txt
# tests/baselines/reference/APISample_parseConfig.errors.txt
# tests/baselines/reference/APISample_transform.errors.txt
# tests/baselines/reference/APISample_watcher.errors.txt
# tests/baselines/reference/api/tsserverlibrary.d.ts
# tests/baselines/reference/api/typescript.d.ts
|
2018-06-16 07:47:30 -07:00 |
|