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

Merge branch 'dev'
---

7d5da019e51adea12a1ad52e07fc71c1ee1de6ab