mirror of
https://github.com/microsoft/TypeScript.git
synced 2025-11-18 17:21:48 +00:00
Merge branch 'release-1.5'
Conflicts: bin/tsc.js bin/tsserver.js bin/typescript.js bin/typescriptServices.js
This commit is contained in: