From bf85b7a530dfacc255cb0fe78a5a0f00df016a82 Mon Sep 17 00:00:00 2001
From: Leo Horie <leohorie@hotmail.com>
Date: Thu, 26 May 2016 11:04:04 -0400
Subject: [PATCH] #1076 absorb native promise in m.prop

---
 mithril.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mithril.js b/mithril.js
index d7054596..12fa23fd 100644
--- a/mithril.js
+++ b/mithril.js
@@ -1306,7 +1306,7 @@
 	}
 
 	m.prop = function (store) {
-		if ((store != null && isObject(store) || isFunction(store)) &&
+		if ((store != null && isObject(store) || isFunction(store)) || store instanceof window.Promise &&
 				isFunction(store.then)) {
 			return propify(store)
 		}