summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/tinc
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-04-19 10:22:14 +0200
committertv <tv@krebsco.de>2017-04-19 10:22:14 +0200
commit66849259eea9e7d24ad6c096b5246b06ba51e303 (patch)
treea64ea338d8084000a9eb370a40cb151ccf38f3ff /makefu/2configs/tinc
parent7275d56742c232b558827ea7549dda0e388410bf (diff)
parent371f8b9b7102c317150da37880dae44bd938d1b1 (diff)
parentd05b989095acf4fd872c955b274a60a9621cd6ec (diff)
Merge remote-tracking branches 'gum/master' and 'prism/master'