Merge remote-tracking branch 'origin/master' into zhengbli_merge

This commit is contained in:
zhengbli
2016-10-24 22:48:38 -07:00
159 changed files with 41783 additions and 8257 deletions

View File

@@ -9,10 +9,10 @@ declare module "react-modal" {
interface ReactModal {
isOpen: boolean;
style?: {
content: {
content?: {
[key: string]: any;
},
overlay: {
overlay?: {
[key: string]: any;
}
},