2be9823010
Conflicts: ethereal/assets/qml/wallet.qml |
||
---|---|---|
.. | ||
newTransaction | ||
first_run.qml | ||
muted.qml | ||
test_app.qml | ||
transactions.qml | ||
wallet.qml | ||
webapp.qml |
2be9823010
Conflicts: ethereal/assets/qml/wallet.qml |
||
---|---|---|
.. | ||
newTransaction | ||
first_run.qml | ||
muted.qml | ||
test_app.qml | ||
transactions.qml | ||
wallet.qml | ||
webapp.qml |