Merge branch 'master' into rename-repo-url

This commit is contained in:
vvakame
2016-03-17 21:06:54 +09:00
1140 changed files with 179704 additions and 179635 deletions
+1 -1
View File
@@ -10,7 +10,7 @@ declare module "nock" {
function nock (host: string, options?: nock.Options): nock.Scope;
module nock {
namespace nock {
export function cleanAll(): void;
export function disableNetConnect(): void;