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

Merge branch 'dev'
---