Merge branch 'upstream/master'
Conflicts: src/bitmessageqt/__init__.py src/translations/bitmessage_en_pirate.pro src/translations/bitmessage_fr.pro src/translations/bitmessage_fr_BE.pro src/translations/bitmessage_ru.pro
This commit is contained in:
commit
383cc59991
Reference in New Issue
Block a user