Merge remote-tracking branch 'origin/dev' into dev
Conflicts: src/cutecoin/core/net/node.py
No related branches found
No related tags found
Showing
- res/icons/.directory 6 additions, 0 deletionsres/icons/.directory
- res/icons/AUTHORS 3 additions, 0 deletionsres/icons/AUTHORS
- res/icons/icons.qrc 3 additions, 0 deletionsres/icons/icons.qrc
- res/icons/noun_62479_cc.svg 49 additions, 0 deletionsres/icons/noun_62479_cc.svg
- res/icons/noun_7440_cc.svg 71 additions, 0 deletionsres/icons/noun_7440_cc.svg
- res/icons/noun_76373_cc.svg 139 additions, 0 deletionsres/icons/noun_76373_cc.svg
- res/ui/homescreen.ui 158 additions, 0 deletionsres/ui/homescreen.ui
- src/cutecoin/core/account.py 112 additions, 32 deletionssrc/cutecoin/core/account.py
- src/cutecoin/core/app.py 87 additions, 7 deletionssrc/cutecoin/core/app.py
- src/cutecoin/core/community.py 182 additions, 9 deletionssrc/cutecoin/core/community.py
- src/cutecoin/core/graph.py 1 addition, 1 deletionsrc/cutecoin/core/graph.py
- src/cutecoin/core/net/network.py 59 additions, 21 deletionssrc/cutecoin/core/net/network.py
- src/cutecoin/core/net/node.py 27 additions, 14 deletionssrc/cutecoin/core/net/node.py
- src/cutecoin/core/person.py 123 additions, 35 deletionssrc/cutecoin/core/person.py
- src/cutecoin/core/transfer.py 75 additions, 8 deletionssrc/cutecoin/core/transfer.py
- src/cutecoin/core/wallet.py 99 additions, 8 deletionssrc/cutecoin/core/wallet.py
- src/cutecoin/core/watchers/blockchain.py 1 addition, 1 deletionsrc/cutecoin/core/watchers/blockchain.py
- src/cutecoin/core/watchers/network.py 1 addition, 1 deletionsrc/cutecoin/core/watchers/network.py
- src/cutecoin/gui/community_tab.py 2 additions, 2 deletionssrc/cutecoin/gui/community_tab.py
- src/cutecoin/gui/currency_tab.py 3 additions, 3 deletionssrc/cutecoin/gui/currency_tab.py
Loading
Please register or sign in to comment