mirror of
https://github.com/monero-project/monero-gui.git
synced 2025-01-19 08:03:48 +02:00
Merge branch 'patch-1' into fix
This commit is contained in:
commit
4066cb22ea
@ -1494,7 +1494,6 @@ Bonvolu plibonigi aŭ konekti al alia demono</translation>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<<<<<<< HEAD
|
||||
<location filename="../pages/Transfer.qml" line="704"/>
|
||||
<location filename="../pages/Transfer.qml" line="716"/>
|
||||
<source>Wallet is not connected to daemon.</source>
|
||||
|
Loading…
Reference in New Issue
Block a user