From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Sat, 21 Apr 2018 08:44:57 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: v1.3.1
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=refs%2Ftags%2Fv1.3.1;hp=-c;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FTrader.git

Merge branch 'dev'
---

239db61d825e0727d2d351e224e7c8552730e472