Merge branch 'master' into rename-repo-url

This commit is contained in:
vvakame committed 2016-03-17 21:06:54 +09:00
commit 7de6c3dd94
1140 files changed
+179704 -179635

No files matched your search

+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;