From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Wed, 12 Feb 2020 00:12:02 +0000 (+0100)
Subject: Merge branch 'master' into android
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2Ftinc%2Fhosts.git;a=commitdiff_plain;h=e97c5917f6bd6690282f1df59916ab038e0ad9fd

Merge branch 'master' into android
---

e97c5917f6bd6690282f1df59916ab038e0ad9fd