Ryan Cavanaugh f55497c988 Merge remote-tracking branch 'upstream/master' into merge_7_25 ...

# Conflicts:
#	convict/convict.d.ts
#	multer/multer.d.ts
#	nodemailer/nodemailer.d.ts
#	react-bootstrap-table/react-bootstrap-table.d.ts
#	react-dnd/react-dnd-tests.ts
#	react-native/index.d.ts
#	request/request.d.ts
#	restify/index.d.ts
#	webpack/webpack.d.ts
#	ws/ws.d.ts

2016-07-27 16:12:49 -07:00

..

index.d.ts

Merge remote-tracking branch 'upstream/master' into merge_7_25

2016-07-27 16:12:49 -07:00

react-bootstrap-table-tests.tsx

Merge remote-tracking branch 'upstream/master' into merge_7_25

2016-07-27 16:12:49 -07:00

tsconfig.json

Fix tsconfig files for new option name / behavior.

2016-07-12 13:54:56 -07:00