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
David Inglis
51f709d4df
Fixes bad indentation issue
...
Removes refernces to the test backend from the html5 backend tests -
the two backends are distinct so it doesn't make sense to test one
inside the other
2016-07-25 16:42:36 -07:00
Phips Peter and David Inglis
ad6ffc4b5c
Separate React DnD
...
This makes it an easier user experience.
2016-07-25 12:14:53 -07:00
Ryan Cavanaugh