Merge remote-tracking branch 'upstream/master' into multi-value_headers_and_query_params

This commit is contained in:
Trevor Leach
2018-10-27 13:45:47 -07:00
2 changed files with 409 additions and 51 deletions

View File

@@ -22,11 +22,8 @@
// Louis Larry <https://github.com/louislarry>
// Daniel Papukchiev <https://github.com/dpapukchiev>
// Oliver Hookins <https://github.com/ohookins>
<<<<<<< HEAD
// Trevor Leach <https://github.com/trevor-leach>
=======
// James Gregory <https://github.com/jagregory>
>>>>>>> upstream/master
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
// TypeScript Version: 2.3