Merge branch 'dev' into mocks
Working tests Conflicts: src/cutecoin/core/net/node.py
No related branches found
No related tags found
Showing
- res/icons/AUTHORS 9 additions, 1 deletionres/icons/AUTHORS
- res/icons/icons.qrc 6 additions, 0 deletionsres/icons/icons.qrc
- res/icons/noun_139613_cc.svg 44 additions, 0 deletionsres/icons/noun_139613_cc.svg
- res/icons/noun_152997_cc.svg 44 additions, 0 deletionsres/icons/noun_152997_cc.svg
- res/icons/noun_155520_cc.svg 59 additions, 0 deletionsres/icons/noun_155520_cc.svg
- res/icons/noun_155533_cc.svg 59 additions, 0 deletionsres/icons/noun_155533_cc.svg
- res/icons/noun_155540_cc.svg 59 additions, 0 deletionsres/icons/noun_155540_cc.svg
- res/icons/noun_178785_cc.svg 65 additions, 0 deletionsres/icons/noun_178785_cc.svg
- res/icons/noun_19900_cc.svg 1 addition, 0 deletionsres/icons/noun_19900_cc.svg
- res/icons/noun_41979_cc.svg 50 additions, 0 deletionsres/icons/noun_41979_cc.svg
- res/ui/community_tab.ui 0 additions, 147 deletionsres/ui/community_tab.ui
- res/ui/community_view.ui 119 additions, 0 deletionsres/ui/community_view.ui
- res/ui/homescreen.ui 162 additions, 130 deletionsres/ui/homescreen.ui
- res/ui/identities_tab.ui 70 additions, 0 deletionsres/ui/identities_tab.ui
- res/ui/mainwindow.ui 6 additions, 17 deletionsres/ui/mainwindow.ui
- res/ui/wallets_tab.ui 1 addition, 150 deletionsres/ui/wallets_tab.ui
- src/cutecoin/core/app.py 2 additions, 1 deletionsrc/cutecoin/core/app.py
- src/cutecoin/core/net/network.py 1 addition, 1 deletionsrc/cutecoin/core/net/network.py
- src/cutecoin/core/net/node.py 2 additions, 3 deletionssrc/cutecoin/core/net/node.py
- src/cutecoin/gui/certification.py 1 addition, 1 deletionsrc/cutecoin/gui/certification.py
Loading
Please register or sign in to comment