]> git.immae.eu Git - perso/Immae/Projets/Cryptomonnaies/Cryptoportfolio/Trader.git/commitdiff
Merge branch 'night_fixes' into dev
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Mon, 12 Mar 2018 01:10:08 +0000 (02:10 +0100)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Mon, 12 Mar 2018 01:10:08 +0000 (02:10 +0100)
1  2 
portfolio.py
test.py

diff --cc portfolio.py
Simple merge
diff --cc test.py
Simple merge