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

+2 -2
View File
@@ -2,7 +2,7 @@
import {flatten, unflatten} from "flat";
module TestFlatten {
namespace TestFlatten {
let options: {
delimiter?: string;
safe?: boolean;
@@ -29,7 +29,7 @@ module TestFlatten {
result = flatten<Target, Result>(target, options);
}
module TestUnflatten {
namespace TestUnflatten {
let options: {
delimiter?: string;
object?: boolean;
+1 -1
View File
@@ -3,7 +3,7 @@
// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
declare module FlatTypes {
declare namespace FlatTypes {
interface FlattenOptions {
delimiter?: string;
safe?: boolean;