aeonix / aeon-gui

AEON GUI
Other
12 stars 11 forks source link

Upstream merge 5 #38

Closed stoffu closed 4 years ago

stoffu commented 4 years ago

This pull request merges upstream patches after https://github.com/monero-project/monero-gui/pull/1446 which is the last one included in #33. This PR includes upstream PRs from https://github.com/monero-project/monero-gui/pull/1572 up to https://github.com/monero-project/monero-gui/pull/1634, merged on Oct 2, 2018 and Oct 11, 2018, respectively:

Notes:

BigslimVdub commented 4 years ago

CLI merge was 9 days ago, care to merge this as well @smooth?

iamsmooth commented 4 years ago

@BigslimVdub I wasn't aware of this one, and I didn't get notified because you didn't use my actual GitHub nick, which is @iamsmooth

I will merge it now.