Merge branch 'master' into handleExtraObjectLiteralProperties

Conflicts:
	parse/parse.d.ts
This commit is contained in:
Daniel Rosenwasser
2015-08-25 10:31:49 -07:00
146 changed files with 26952 additions and 4182 deletions
+2 -2
View File
@@ -761,8 +761,8 @@ declare module __React {
// ----------------------------------------------------------------------
interface ReactChildren {
map<T>(children: ReactNode, fn: (child: ReactChild) => T): { [key:string]: T };
forEach(children: ReactNode, fn: (child: ReactChild) => any): void;
map<T>(children: ReactNode, fn: (child: ReactChild, index: number) => T): { [key:string]: T };
forEach(children: ReactNode, fn: (child: ReactChild, index: number) => any): void;
count(children: ReactNode): number;
only(children: ReactNode): ReactChild;
}