Kanchalai Tanglertsampan 3600ccc833 Merge branch 'master' into master-14217
# Conflicts:
#	tests/baselines/reference/bestChoiceType.symbols
#	tests/baselines/reference/classExpressionWithStaticProperties3.symbols
#	tests/baselines/reference/classExpressionWithStaticPropertiesES63.symbols
#	tests/baselines/reference/declarationEmitPromise.symbols
#	tests/baselines/reference/keyofAndIndexedAccess.symbols
#	tests/baselines/reference/mapOnTupleTypes01.symbols
#	tests/baselines/reference/mapOnTupleTypes02.symbols
#	tests/baselines/reference/mappedTypeRelationships.errors.txt
#	tests/baselines/reference/noImplicitAnyInContextuallyTypesFunctionParamter.symbols
#	tests/baselines/reference/specializationsShouldNotAffectEachOther.symbols
#	tests/baselines/reference/tsxSpreadChildren.symbols
#	tests/baselines/reference/typedArrays.symbols
2017-03-21 07:36:08 -07:00
..