Merge branch 'master' into express4

Conflicts:
	express/express.d.ts
This commit is contained in:
Santi Albo
2014-07-17 19:25:52 +01:00
419 changed files with 568834 additions and 17535 deletions
+7
View File
@@ -3,6 +3,13 @@
// Definitions by: Boris Yankov <https://github.com/borisyankov/>
// Definitions: https://github.com/borisyankov/DefinitelyTyped
/* =================== USAGE ===================
import express = require('express');
var app = express();
=============================================== */
/// <reference path="../node/node.d.ts" />
declare module Express {