From 0438123cb941ed60f7f90cef22e2524dbcb086bc Mon Sep 17 00:00:00 2001
From: Giacomo Rebonato <grebonato@zendesk.com>
Date: Sat, 13 Aug 2016 23:04:24 +0100
Subject: [PATCH 1/2] added optional style object to CommonFlexProps

---
 react-flex/react-flex.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/react-flex/react-flex.d.ts b/react-flex/react-flex.d.ts
index ddb7c3e5da..17a7a6e9e7 100644
--- a/react-flex/react-flex.d.ts
+++ b/react-flex/react-flex.d.ts
@@ -9,6 +9,11 @@ declare namespace __ReactFlex {
     export import React = __React;
 
     interface CommonFlexProps {
+        /**
+         * For custom style
+         */
+        style?: Object;
+
         /**
          * For `display: inline-flex`.
          */

From 4f1b5f462bee8dedcf530e89f605db080f05fca7 Mon Sep 17 00:00:00 2001
From: Giacomo Rebonato <grebonato@zendesk.com>
Date: Mon, 15 Aug 2016 21:12:56 +0100
Subject: [PATCH 2/2] changed object to any

---
 react-flex/react-flex.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/react-flex/react-flex.d.ts b/react-flex/react-flex.d.ts
index 17a7a6e9e7..2bfb73c7cd 100644
--- a/react-flex/react-flex.d.ts
+++ b/react-flex/react-flex.d.ts
@@ -12,7 +12,7 @@ declare namespace __ReactFlex {
         /**
          * For custom style
          */
-        style?: Object;
+        style?: any;
 
         /**
          * For `display: inline-flex`.