From 1611a750365d4654d09ccb86eca6a5f95a1865e5 Mon Sep 17 00:00:00 2001 From: diminator Date: Fri, 4 Sep 2015 16:48:00 +0200 Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/AD-858-contract-history' into AD-883-show-notificationsrequests-on-col Conflicts: ownership/serializers.py --- .../wallet/components/ikonotv/ikonotv_contract_notifications.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_contract_notifications.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_contract_notifications.js index 636948d6..5e30d370 100644 --- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_contract_notifications.js +++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_contract_notifications.js @@ -39,7 +39,7 @@ let IkonotvContractNotifications = React.createClass({
-