Dimitri Benin d75bcc6980 Merge remote-tracking branch 'upstream/master' into on-headers ...

# Conflicts:
#	types/on-headers/index.d.ts

2017-08-21 10:52:24 +02:00

..

index.d.ts

…

on-headers-tests.ts

…

tsconfig.json

…

tslint.json

…