Merge remote-tracking branch 'origin/dev0113' into dev0113 (bbac6295) · Commits · clients / python / sakia · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

sakia
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

bbac6295

Commit bbac6295 authored 9 years ago by Vincent Texier

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/dev0113' into dev0113

Conflicts:
	src/sakia/core/money/quant_zerosum.py
	src/sakia/core/money/relative_zerosum.py

parents 067f2964 82047ee3

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/sakia/core/money/quant_zerosum.py 5 additions, 1 deletion

src/sakia/core/money/quant_zerosum.py
src/sakia/core/money/quantitative.py 12 additions, 6 deletions

src/sakia/core/money/quantitative.py
src/sakia/core/money/relative.py 11 additions, 7 deletions

src/sakia/core/money/relative.py
src/sakia/core/money/relative_zerosum.py 11 additions, 2 deletions

src/sakia/core/money/relative_zerosum.py
src/sakia/core/wallet.py 0 additions, 2 deletions

src/sakia/core/wallet.py
src/sakia/gui/certification.py 6 additions, 4 deletions

src/sakia/gui/certification.py
src/sakia/gui/process_cfg_account.py 5 additions, 0 deletions

src/sakia/gui/process_cfg_account.py
src/sakia/gui/transfer.py 6 additions, 4 deletions

src/sakia/gui/transfer.py

with 56 additions and 26 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment