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

Merge master into jr-reverse-caching

Browse Source
This commit is contained in:
Jannis R
2017-01-06 13:35:50 +01:00
parent 2aa76e5acc 52d3633473
commit ad3b89dc14
46 changed files with 2396 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/ui/Icons/index.js
View File

@@ -25,6 +25,7 @@ import DashboardIcon from 'material-ui/svg-icons/action/dashboard';
import DeleteIcon from 'material-ui/svg-icons/action/delete';
import DoneIcon from 'material-ui/svg-icons/action/done-all';
import EditIcon from 'material-ui/svg-icons/content/create';
import LinkIcon from 'material-ui/svg-icons/content/link';
import LockedIcon from 'material-ui/svg-icons/action/lock';
import NextIcon from 'material-ui/svg-icons/navigation/arrow-forward';
import PrevIcon from 'material-ui/svg-icons/navigation/arrow-back';
@@ -47,6 +48,7 @@ export {
DeleteIcon,
DoneIcon,
EditIcon,
LinkIcon,
LockedIcon,
NextIcon,
PrevIcon,