grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into jg-test-ui

Browse Source
This commit is contained in:
Jaco Greeff
2016-12-09 18:34:58 +01:00
parent 00c53a8d18 fd23a2972c
commit a73e0a987e
63 changed files with 539 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/views/Wallet/Transactions/transactions.js
View File

@@ -18,7 +18,7 @@ import React, { Component, PropTypes } from 'react';
import { bytesToHex } from '~/api/util/format';
import { Container } from '~/ui';
import { TxRow } from '~/ui/TxList/txList';
import TxRow from '~/ui/TxList/TxRow';
import txListStyles from '~/ui/TxList/txList.css';