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
+2 -2
View File
@@ -5,7 +5,7 @@
/// <reference path="../express/express.d.ts" />
declare module Express {
declare namespace Express {
export interface Request {
/**
* @summary Clears the timeout on the request.
@@ -23,7 +23,7 @@ declare module Express {
declare module "connect-timeout" {
import express = require("express");
module e {
namespace e {
/**
* @summary Interface for timeout options.
* @interface