From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Thu, 5 Apr 2018 10:15:08 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: v1.1.4
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FTrader.git;a=commitdiff_plain;h=4ef232d8192b8133eda732f7d6afb7be6bf25abc

Merge branch 'dev'
---

4ef232d8192b8133eda732f7d6afb7be6bf25abc