fix conflicts and rebase

Browse source

...

This commit is contained in:

erciccione 2017-09-15 15:22:04 +01:00

parent 4c75fe47f9

commit 78e3cd4a63

No known key found for this signature in database

GPG key ID: 8C683AE08CD4A88C

1 changed files with 230 additions and 214 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

444

translations/monero-core_eo.ts

View file

File diff suppressed because it is too large Load diff