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

Merge branch 'master' into android
---

dcd32c4a917e1917e82a5d6436b5fcdf3c36cd22