From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Sun, 25 Mar 2018 20:01:59 +0000 (+0200)
Subject: Merge branch 'timeouts' into dev
X-Git-Tag: v1.0^2
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FTrader.git;a=commitdiff_plain;h=d004a2a5e15a78991870dcb90cd6db63ab40a4e6;hp=7f3e7d27409fd7355db9ae4f8fe9a346cd50c712

Merge branch 'timeouts' into dev

Fixes https://git.immae.eu/mantisbt/view.php?id=58
---