Commit Graph

5 Commits

Author SHA1 Message Date
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
Ian Ker-Seymer
34e87e1bca
react-bootstrap-table: add cols and rows options to Editable 2016-07-26 15:36:16 -04:00
Ryan Cavanaugh
50387d4046 Change relative reference paths to types references. Errors incoming... 2016-05-09 18:06:27 -07:00
Ryan Cavanaugh
81862d240d More fixes 2016-05-04 22:50:05 -07:00
Frank Laub
ae60c84b92 Add definitions for react-bootstrap-table 2016-02-04 07:58:49 -08:00