From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Sun, 22 Apr 2018 11:50:49 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: v1.4
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=6cffa4af8b5a04b17ffd95738b8e843c4605d4e7;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FTrader.git

Merge branch 'dev'
---

6cffa4af8b5a04b17ffd95738b8e843c4605d4e7