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
@@ -3,7 +3,7 @@
// Definitions by: Pine Mizune <https://github.com/pine613>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
declare module ContentType {
declare namespace ContentType {
interface MediaType {
type: string;
q?: number;
@@ -29,4 +29,4 @@ declare module ContentType {
declare module "content-type" {
var x: ContentType.MediaTypeStatic;
export = x;
}
}