From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Mon, 2 Apr 2018 17:20:48 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: v1.1
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=3699463ad7774883070d52a77a0d495fdcce6bbc;hp=-c;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FTrader.git

Merge branch 'dev'
---

3699463ad7774883070d52a77a0d495fdcce6bbc