]> git.immae.eu Git - perso/Immae/Config/tinc/hosts.git/commit
Merge branch 'master' into android
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Sun, 29 May 2016 21:35:39 +0000 (23:35 +0200)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Sun, 29 May 2016 21:35:39 +0000 (23:35 +0200)
commit338a604b137012c6455679a7b46adc46c793341d
tree54bc353ca4cc6168dccaf291433839c2df097972
parent79f6022bf202371af204470605cfda10ba60d039
parent0cd140f46c68098a5d66332d3fb9d461e1bc7827
Merge branch 'master' into android