]> git.immae.eu Git - perso/Immae/Config/tinc/hosts.git/commitdiff
Merge branch 'master' into android
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Fri, 24 Nov 2017 09:33:21 +0000 (10:33 +0100)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Fri, 24 Nov 2017 09:33:21 +0000 (10:33 +0100)

Trivial merge